| commit | c6dd85a3e1ec00571a2ab6e1720febfece39da4b | [log] [tgz] |
|---|---|---|
| author | Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> | Tue Dec 02 11:33:32 2014 -0800 |
| committer | Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> | Tue Dec 02 11:39:05 2014 -0800 |
| tree | df20f0952dba53b1a4eedd0c36a1b3fb8e979900 | |
| parent | b7d2a585f55e899df2c42397f57efefaca10d1d0 [diff] |
Null pointer exception while reading the published attributes from IOF13Switch object
diff --git a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplSpringOpenTTP.java b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplSpringOpenTTP.java index 1b0d9ef..6b453b8 100644 --- a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplSpringOpenTTP.java +++ b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplSpringOpenTTP.java
@@ -189,6 +189,7 @@ isEdgeRouter = false; groupid = new AtomicInteger(0); this.usePipeline13 = usePipeline13; + publishAttributes = null; } // *****************************
diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java index 3ed55e9..53fb165 100644 --- a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java +++ b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
@@ -393,7 +393,8 @@ for (Entry<String, String> e : attr.entrySet()) { switchData.createStringAttribute(e.getKey(), e.getValue()); } - if (sw instanceof IOF13Switch) { + if ((sw instanceof IOF13Switch) && + (((IOF13Switch) sw).getPublishAttributes() != null)) { Map<String, String> pa = ((IOF13Switch) sw).getPublishAttributes(); for (Entry<String, String> e : pa.entrySet()) { switchData.createStringAttribute(e.getKey(), e.getValue());