commit f11c9a2ae8a9e04e064176cae5891d4531684e96
author Yi Tseng <yi@opennetworking.org> Tue Feb 13 02:34:54 2018 +0000
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Feb 13 02:35:16 2018 +0000
tree e01401a38adeb35ad39800c8d2b39acdc1d1af12
parent baab4244a542fff7fbd3860baa9beb3252fe1cfb

Revert "Fix NPE of ProxyArp"

This reverts commit 1b22a2ca4bd2bfad272de93605333c6f80d9448c.

Change-Id: I69500a9315c46785b9b867d49f9e1776cfdf2ea6

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