commit 3f8ee43464a91bbd169cb44798c69291cdea853d
author Amit Ghosh <aghosh@radisys.com> Thu Sep 21 15:49:37 2017 +0100
committer David Bainbridge <dbainbri@ciena.com> Mon Sep 25 08:54:19 2017 -0700
tree 8cec9a348816bbeb03b36a14b1e04f4788aae17c
parent f66d0dbc8b3c979ddb297b7cf8b6278c52af4329

VOL-458: NPE when executing ONOS aaa-users command after an disable ONU

Change-Id: I81720d2de540aee392b1038b443d8ed6c8fadc75

src/main/java/org/opencord/aaa/AaaShowUsersCommand.java

diff --git a/src/main/java/org/opencord/aaa/AaaShowUsersCommand.java b/src/main/java/org/opencord/aaa/AaaShowUsersCommand.java
index e64a6fe..f05dd8a 100644
--- a/src/main/java/org/opencord/aaa/AaaShowUsersCommand.java
+++ b/src/main/java/org/opencord/aaa/AaaShowUsersCommand.java
@@ -46,13 +46,20 @@
         for (StateMachine stateMachine : StateMachine.sessionIdMap().values()) {
             String deviceId = stateMachine.supplicantConnectpoint().deviceId().toString();
             String portNum = stateMachine.supplicantConnectpoint().port().toString();
-            String username = new String(stateMachine.username());
-            String mac = stateMachine.supplicantAddress().toString();
+
+            String username = "UNKNOWN";
+            if (stateMachine.username() != null) {
+                username = new String(stateMachine.username());
+            }
+            String mac = "UNKNOWN";
+            if (stateMachine.supplicantAddress() != null) {
+                mac = stateMachine.supplicantAddress().toString();
+            }
 
             String nasPortId = devService.getPort(stateMachine.supplicantConnectpoint()).
                     annotations().value(AnnotationKeys.PORT_NAME);
 
-            String subsId = "Unknown";
+            String subsId = "UNKNOWN";
             SubscriberAndDeviceInformation subscriber = subsService.get(nasPortId);
             if (subscriber != null) {
                 subsId = subscriber.nasPortId();