commit df833c888de95b461289949293ede206506c5169
author Eric Tang <qcorba@gmail.com> Sun Jun 04 22:55:49 2017 +0800
committer Yoonseon Han <yoonseon@onlab.us> Thu Jun 29 05:10:51 2017 +0000
tree bcf5a631c3e80b0a23186302fab0f5f218aa67ba
parent f14cc6d3c2a61b59012bef8ec1ebdcded07098b6

ONOS-6546 Fix NullPointerException.

Change-Id: Ib3fd45fe957d3f17b096b7b8c2fa8d760fbe9f24

apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFSwitchManager.java

diff --git a/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFSwitchManager.java b/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFSwitchManager.java
index 9d58115..e23cb81 100644
--- a/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFSwitchManager.java
+++ b/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFSwitchManager.java
@@ -165,6 +165,11 @@
         log.info("Added virtual OF switch for {}", deviceId);
 
         OFAgent ofAgent = ofAgentService.agent(networkId);
+        if (ofAgent == null) {
+            log.error("OFAgent for network {} does not exist", networkId);
+            return;
+        }
+
         if (ofAgent.state() == STARTED) {
             connectController(ofSwitch, ofAgent.controllers());
         }