commit d70407da1fceee3939e76e411e29dd4567bcf7ee
author Qianqian Hu <Qianqian.Hu@alcatel-sbell.com.cn> Thu Feb 18 15:35:33 2016 +0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Feb 18 23:03:05 2016 +0000
tree 582f8610357151fa1ac84593576abd197e2c99c4
parent 395e56e957dd891207d96d0ec6088267fe72bd0c

When authenticaiton succees, a NullPointerException may be triggered if there is no match in portToVlanMap , which will stop aaa from listening to radius server. A try-catch is added here in order to prevent subsequent authentication failure in aaa

Change-Id: Iea0c53ff59ed42f0c369400c155b7d8e14a6748f

apps/xos-integration/src/main/java/org/onosproject/xosintegration/OnosXosIntegrationManager.java

diff --git a/apps/xos-integration/src/main/java/org/onosproject/xosintegration/OnosXosIntegrationManager.java b/apps/xos-integration/src/main/java/org/onosproject/xosintegration/OnosXosIntegrationManager.java
index 04dd0b8..df3a29f 100644
--- a/apps/xos-integration/src/main/java/org/onosproject/xosintegration/OnosXosIntegrationManager.java
+++ b/apps/xos-integration/src/main/java/org/onosproject/xosintegration/OnosXosIntegrationManager.java
@@ -340,7 +340,13 @@
         }
 
         PortNumber onuPort = newTenant.port().port();
-        VlanId subscriberVlan = VlanId.vlanId(portToVlan.get(onuPort.toLong()));
+        VlanId subscriberVlan;
+        try {
+            subscriberVlan = VlanId.vlanId(portToVlan.get(onuPort.toLong()));
+        } catch (NullPointerException npe) {
+            log.error("No matched port in portToVlan map", npe);
+            return newTenant;
+        }
 
         VoltTenant tenantToCreate = VoltTenant.builder()
                 .withProviderService(providerServiceId)