commit d6209677e1f8abbf7e4e83b708a7b87e9ab7c3b4
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Feb 29 13:45:16 2016 -0800
committer Sho Shimizu <sho.shimizu@gmail.com> Tue Mar 01 16:41:25 2016 +0000
tree a5648a88c8eb645461321b264ad16291490f3f75
parent ec0433dbceac818d5508481072c8a832fedb7021

Simplify statements

Change-Id: Ibc7df94233348d996c9e22d2f61e9f80a7508701

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 5dd4f69..11a6655 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,23 +558,10 @@
     }
 
     private boolean isMultiplexingSupported(ConnectPoint src, ConnectPoint dst) {
-        if (!isTributarySlotBehaviourSupported(src.deviceId())) {
-            return false;
-        }
-
-        if (!isTributarySlotBehaviourSupported(dst.deviceId())) {
-            return false;
-        }
-
-        if (staticPort(src) != null) {
-            return false;
-        }
-
-        if (staticPort(dst) != null) {
-            return false;
-        }
-
-        return true;
+        return isTributarySlotBehaviourSupported(src.deviceId())
+                && isTributarySlotBehaviourSupported(dst.deviceId())
+                && staticPort(src) == null
+                && staticPort(dst) == null;
     }
 
     /**