홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Sho Shimizu
d6209677 1 parent ec0433db

Simplify statements 

Change-Id: Ibc7df94233348d996c9e22d2f61e9f80a7508701
Inline Side-by-side
Showing 1 changed file with 4 additions and 17 deletions
...@@ -558,23 +558,10 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu ...@@ -558,23 +558,10 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
558 } 558 }
559 559
560 private boolean isMultiplexingSupported(ConnectPoint src, ConnectPoint dst) { 560 private boolean isMultiplexingSupported(ConnectPoint src, ConnectPoint dst) {
561 - if (!isTributarySlotBehaviourSupported(src.deviceId())) { 561 + return isTributarySlotBehaviourSupported(src.deviceId())
562 - return false; 562 + && isTributarySlotBehaviourSupported(dst.deviceId())
563 - } 563 + && staticPort(src) == null
564 - 564 + && staticPort(dst) == null;
565 - if (!isTributarySlotBehaviourSupported(dst.deviceId())) {
566 - return false;
567 - }
568 -
569 - if (staticPort(src) != null) {
570 - return false;
571 - }
572 -
573 - if (staticPort(dst) != null) {
574 - return false;
575 - }
576 -
577 - return true;
578 } 565 }
579 566
580 /** 567 /**
......