commit e5a1aa9b72f2d8598f06a5c6254d980830fc7d80
author Girish Kumar <girish_kumar@infosys.com> Fri Feb 14 14:08:54 2020 +0000
committer Girish Kumar <girish_kumar@infosys.com> Wed Feb 19 11:51:54 2020 +0000
tree d5275384ccf6e65dc5551b4c51f78d1b5d02a04a
parent c5440c0a19d92b2042e1f2b9fcf10485372bb8f5

[VOL-2587] Fixed NullPointerException for PORT_REMOVED event when ONU is deleted

Change-Id: Ie499fc39494e52d9150cc665c76d1dae61facb17

app/src/main/java/org/opencord/aaa/impl/AaaManager.java

diff --git a/app/src/main/java/org/opencord/aaa/impl/AaaManager.java b/app/src/main/java/org/opencord/aaa/impl/AaaManager.java
index c2e62eb..79fc22c 100644
--- a/app/src/main/java/org/opencord/aaa/impl/AaaManager.java
+++ b/app/src/main/java/org/opencord/aaa/impl/AaaManager.java
@@ -1101,10 +1101,14 @@
 
         private void flushStateMachineSession(String sessionId, String terminationReason) {
             StateMachine stateMachine = stateMachines.get(sessionId);
-            if (stateMachine != null) {
-                stateMachine.setSessionTerminateReason(terminationReason);
+            if (stateMachine == null) {
+                // No active AAA sessions for this UNI port
+                log.debug("No Active AAA Session found with Id {}", sessionId);
+                return;
             }
 
+            stateMachine.setSessionTerminateReason(terminationReason);
+
             //pushing captured machine stats to kafka
             AaaSupplicantMachineStats obj = aaaSupplicantStatsManager.getSupplicantStats(stateMachine);
             aaaSupplicantStatsManager.getMachineStatsDelegate()