commit 35cc3e6142e15c699b6668676b3faceede356603
author sdn <jy0624.seo@samsung.com> Fri Jun 01 18:08:41 2018 +0900
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Fri Jun 01 22:04:24 2018 +0000
tree 37daf6700fcb6f7f0a140cf50beb96b5a0c1661e
parent 89369461075921cd325e78084c10241624eefda3

[Bug Fix]Check NullPointer Exception at driver pipeliner

Change-Id: I6aac0e2f7844e03f4e833cd165fa74d9904b04e8

drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperQfx5100Pipeliner.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperQfx5100Pipeliner.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperQfx5100Pipeliner.java
index 76a717d..549dbfe 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperQfx5100Pipeliner.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperQfx5100Pipeliner.java
@@ -58,14 +58,15 @@
     private ServiceDirectory serviceDirectory;
     private DeviceId deviceId;
     private FlowRuleService flowRuleService;
-
     protected DeviceService deviceService;
+
     @Override
     public void init(DeviceId deviceId, PipelinerContext context) {
+        super.init(deviceId, context);
         this.deviceId = deviceId;
         this.serviceDirectory = context.directory();
         this.flowRuleService = serviceDirectory.get(FlowRuleService.class);
-        this.deviceService = serviceDirectory.get(DeviceService.class);
+        deviceService = serviceDirectory.get(DeviceService.class);
     }
 
     @Override
@@ -80,8 +81,8 @@
         FlowRuleOperations.Builder flowOpsBuilder = FlowRuleOperations.builder();
 
         ForwardingObjective newFwd = forwardObjective;
-
         Device device = deviceService.getDevice(deviceId);
+
         if (forwardObjective.treatment() != null && forwardObjective.treatment().clearedDeferred()) {
             log.warn("Using 'clear actions' instruction which is not supported by {}  {} {} Switch",
                     device.id(), device.manufacturer(), device.hwVersion());