VOL-3925: For PORT_UPDATED event Null pointer exception in ONOS Olt topology app
Change-Id: I84f8aa8e51992043f856a3d5227b305838f41f4b
diff --git a/api/pom.xml b/api/pom.xml
index 7f7bd54..c3fdf94 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>olttopology</artifactId>
<groupId>org.opencord</groupId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/app/pom.xml b/app/pom.xml
index 4ae3c3d..c12d855 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.opencord</groupId>
<artifactId>olttopology</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
APIs for interacting with the CORD OLT application.
</api.description>
<api.package>org.opencord.olttopology.rest</api.package>
- <olttopology.api.version>1.0.1</olttopology.api.version>
+ <olttopology.api.version>1.0.2</olttopology.api.version>
<sadis.api.version>5.0.0</sadis.api.version>
</properties>
diff --git a/app/src/main/java/org/opencord/olttopology/impl/OltTopology.java b/app/src/main/java/org/opencord/olttopology/impl/OltTopology.java
index a0bf497..65bd5c5 100644
--- a/app/src/main/java/org/opencord/olttopology/impl/OltTopology.java
+++ b/app/src/main/java/org/opencord/olttopology/impl/OltTopology.java
@@ -723,7 +723,8 @@
break;
case PORT_UPDATED:
// if Port is enabled, provision LLDP flow and send LLDP packet to NNI Port.
- if (!oltPortMap.get(devId).equals(event.port())) {
+ if (Objects.nonNull(oltPortMap.get(devId)) &&
+ !oltPortMap.get(devId).equals(event.port())) {
break;
}
if (event.port().isEnabled()) {
diff --git a/pom.xml b/pom.xml
index 080af98..fb4f4b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.opencord</groupId>
<artifactId>olttopology</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
<packaging>pom</packaging>
<properties>
@@ -150,4 +150,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>