Merge remote-tracking branch 'origin/test' into dev
This commit is contained in:
commit
c4cc217cd3
@ -98,18 +98,23 @@ public class RouteOverlap extends MapNamedElement {
|
||||
public void releaseImmediately() {
|
||||
if (!CollectionUtils.isEmpty(this.pathList)) {
|
||||
for (SectionPath path : this.pathList) {
|
||||
List<RouteFls> flsList = path.getFlsList();
|
||||
for (SwitchElement element : path.getSwitchList()) {
|
||||
element.getASwitch().overlapUnLock();
|
||||
Switch aSwitch = element.getASwitch();
|
||||
aSwitch.overlapUnLock();
|
||||
if (!CollectionUtils.isEmpty(flsList)) {
|
||||
for (RouteFls routeFls : flsList) {
|
||||
if (routeFls.getBase().getASwitch().equals(aSwitch) &&
|
||||
!aSwitch.isRouteLock()) {
|
||||
routeFls.unlock();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for (Section section1 : path.getSectionList()) {
|
||||
section1.overlapUnlocking();
|
||||
}
|
||||
List<RouteFls> flsList = path.getFlsList();
|
||||
if (!CollectionUtils.isEmpty(flsList)) {
|
||||
for (RouteFls routeFls : flsList) {
|
||||
routeFls.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
this.forbidden = true;
|
||||
|
Loading…
Reference in New Issue
Block a user