Refactor: Simplify method

Change-Id: I84e88480d7b005db4585afa7f9296f8a2d7cbef3

Refactor: Simplify method
Change-Id: I84e88480d7b005db4585afa7f9296f8a2d7cbef3
Sho SHIMIZU · Gerrit Code Review
Commit 9fe0f36ab549f7184ee2bed1eba3e71e2f4d04ad 9fe0f36a 1 parent aa00e500
Showing 1 changed file with 2 additions and 7 deletions
core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
View file @9fe0f36
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
View file @9fe0f36
@@ -291,13 +291,8 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
     }
 
     private boolean isAllowed(ConnectPoint circuitCp, ConnectPoint connectivityCp) {
-         ConnectPoint srcStaticPort = staticPort(circuitCp);
-         if (srcStaticPort != null) {
-             if (!srcStaticPort.equals(connectivityCp)) {
-                 return false;
-             }
-         }
-         return true;
+         ConnectPoint staticPort = staticPort(circuitCp);
+         return staticPort == null || staticPort.equals(connectivityCp);
     }
 
     /**