commit 1b22a2ca4bd2bfad272de93605333c6f80d9448c
author Yi Tseng <yi@opennetworking.org> Sun Feb 11 16:46:29 2018 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Mon Feb 12 00:51:50 2018 +0000
tree 85b2ba18a3268d367a0213f8e0ccf994cbf67fc7
parent caf91d74fcea3c0c91b5da6e9e609844d8ae1a74

Fix NPE of ProxyArp

Change-Id: I13753586c806ad6beedccf44729971e874ea8e19

apps/proxyarp/src/main/java/org/onosproject/proxyarp/DefaultProxyArp.java

diff --git a/apps/proxyarp/src/main/java/org/onosproject/proxyarp/DefaultProxyArp.java b/apps/proxyarp/src/main/java/org/onosproject/proxyarp/DefaultProxyArp.java
index 4f02787..0f613ac 100644
--- a/apps/proxyarp/src/main/java/org/onosproject/proxyarp/DefaultProxyArp.java
+++ b/apps/proxyarp/src/main/java/org/onosproject/proxyarp/DefaultProxyArp.java
@@ -59,8 +59,7 @@
     private ApplicationId appId;
 
     private InternalEdgeListener edgeListener = new InternalEdgeListener();
-    private DefaultNeighbourMessageHandler defaultHandler =
-            new DefaultNeighbourMessageHandler(interfaceService);
+    private DefaultNeighbourMessageHandler defaultHandler;
 
     @Activate
     protected void activate() {
@@ -68,6 +67,8 @@
 
         edgeService.addListener(edgeListener);
         edgeService.getEdgePoints().forEach(this::addDefault);
+
+        defaultHandler = new DefaultNeighbourMessageHandler(interfaceService);
     }
 
     @Deactivate