commit ec0433dbceac818d5508481072c8a832fedb7021
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Feb 29 13:42:30 2016 -0800
committer Sho Shimizu <sho.shimizu@gmail.com> Tue Mar 01 16:25:05 2016 +0000
tree 08039c1fa823a29ec247c6777fd4d65881772fdd
parent 92e4a0478e930cb53e5c7d0efa6b1d9c9110c7c2

Refactor: Split into two if statements and inline variables

Change-Id: I2760c5d57272698307e96e3c3cc6d62467ca342a

core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
index 148e0bc..5dd4f69 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
@@ -558,17 +558,19 @@
     }
 
     private boolean isMultiplexingSupported(ConnectPoint src, ConnectPoint dst) {
-        if (!isTributarySlotBehaviourSupported(src.deviceId()) ||
-                !isTributarySlotBehaviourSupported(dst.deviceId())) {
+        if (!isTributarySlotBehaviourSupported(src.deviceId())) {
             return false;
         }
 
-        ConnectPoint srcStaticPort = staticPort(src);
-        if (srcStaticPort != null) {
+        if (!isTributarySlotBehaviourSupported(dst.deviceId())) {
             return false;
         }
-        ConnectPoint dstStaticPort = staticPort(dst);
-        if (dstStaticPort != null) {
+
+        if (staticPort(src) != null) {
+            return false;
+        }
+
+        if (staticPort(dst) != null) {
             return false;
         }