Commit a9bc89f9 authored by Georgios Dagkakis's avatar Georgios Dagkakis

extra check in RoutingQueue

parent 3746ff6a
...@@ -57,6 +57,11 @@ class RoutingQueue(Queue): ...@@ -57,6 +57,11 @@ class RoutingQueue(Queue):
if not isInRouting: if not isInRouting:
for entity in activeObjectQueue: for entity in activeObjectQueue:
if not entity.receiver: if not entity.receiver:
# check additionally the next objects if they alreay hold a sub-batch of this batch
for o in self.next:
if o.getActiveObjectQueue():
if o.getActiveObjectQueue()[0].parentBatch==entity.parentBatch and not (o is callerObject):
return False
isInRouting=True isInRouting=True
break break
return len(activeObjectQueue)>0 and thecaller.isInRouteOf(self) and isInRouting return len(activeObjectQueue)>0 and thecaller.isInRouteOf(self) and isInRouting
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment