| commit | 8b6b172656a9444518eec62cd3ea596eb5b12e4f | [log] [tgz] |
|---|---|---|
| author | Brian O'Connor <bocon@onlab.us> | Mon Dec 08 01:28:50 2014 -0800 |
| committer | Pavlin Radoslavov <pavlin@onlab.us> | Tue Jan 13 22:47:14 2015 +0000 |
| tree | 0f46454afb2d33e1075d7b7f8530722117f1ecef | |
| parent | eb27c45ba3ef03be0a827ea399c777e8858288cd [diff] |
temporary NPE fix for ONOS-439 [Merged from onos-1.0] Change-Id: I238ea24e1a4c4bebb40d132d060c418f5675f570 (cherry picked from commit f25a5115e901f1f3383ccb60af7ad48355c39ee2)
diff --git a/apps/optical/src/main/java/org/onosproject/optical/OpticalLinkProvider.java b/apps/optical/src/main/java/org/onosproject/optical/OpticalLinkProvider.java index 3e7ae17..200126b 100644 --- a/apps/optical/src/main/java/org/onosproject/optical/OpticalLinkProvider.java +++ b/apps/optical/src/main/java/org/onosproject/optical/OpticalLinkProvider.java
@@ -137,8 +137,14 @@ Port srcPort = deviceService.getPort(srcId, link.src().port()); Port dstPort = deviceService.getPort(dstId, link.dst().port()); + if (srcPort == null || dstPort == null) { + return; //FIXME remove this in favor of below TODO + } + boolean active = deviceService.isAvailable(srcId) && deviceService.isAvailable(dstId) && + // TODO: should update be queued if src or dstPort is null? + //srcPort != null && dstPort != null && srcPort.isEnabled() && dstPort.isEnabled(); LinkDescription desc = new DefaultLinkDescription(link.src(), link.dst(), OPTICAL);
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java index e37140d..1e2b97c 100644 --- a/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java +++ b/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java
@@ -133,6 +133,7 @@ List<FlowRuleBatchEntry> rules = Lists.newLinkedList(); ConnectPoint prev = intent.src(); + //FIXME check for null allocations //TODO throw exception if the lambda was not assigned successfully for (Link link : intent.path().links()) { Lambda la = null;