X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2FNodeTable.java;fp=opendaylight%2Fsal%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2FNodeTable.java;h=68ff9b4f3804d773790b5a573c77563b6b46ccea;hb=fae0114184010519a175ef4b529c84e735c2e41f;hp=22c379614dbd0657d0d97e556a06f48a25b91309;hpb=671ed03b594d3877beb43712f2fbedae99fbe882;p=controller.git

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeTable.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeTable.java
index 22c379614d..68ff9b4f38 100644
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeTable.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeTable.java
@@ -118,6 +118,7 @@ public class NodeTable implements Serializable {
     /**
      * Private constructor used for JAXB mapping
      */
+    @SuppressWarnings("unused")
     private NodeTable() {
         this.nodeTableIDString = null;
         this.nodeTableID = null;
@@ -207,7 +208,7 @@ public class NodeTable implements Serializable {
      */
     @XmlAttribute(name = "id")
     public String getNodeTableIDString() {
-        return this.nodeTableIDString.toString();
+        return this.nodeTableIDString != null? this.nodeTableIDString : nodeTableID.toString();
     }
 
     /**