summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/lifecycle
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2013-03-27 11:45:11 +0100
committerAndrew Branson <andrew.branson@cern.ch>2013-03-27 11:45:11 +0100
commit19dffc5b88d2eeee833b7e469297a6ce535c7183 (patch)
treee4d04fb73456c6df36e2d1fca364d1b5ebb060c8 /src/main/java/com/c2kernel/lifecycle
parent9233aa7c396a63abf8fb27272f9b3b82e485d41e (diff)
Olivier's fix for advancement!
Diffstat (limited to 'src/main/java/com/c2kernel/lifecycle')
-rw-r--r--src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java b/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
index 6a3abe7..982d951 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
@@ -80,7 +80,7 @@ public class AdvancementCalculator implements Serializable
current.mIsbranchActive = current.mIsbranchActive || adv.mIsbranchActive||act.getActive();
current.mNbActLeftWithCurrent += adv.mNbActLeftWithCurrent;
current.mNbActLeftWithoutCurrent += adv.mNbActLeftWithoutCurrent;
- current.mHasPrevActive = adv.mHasPrevActive||act.getActive();
+ current.mHasPrevActive |= adv.mHasPrevActive||act.getActive();
if (adv.hasprevActive.size()!=0) current.mHasPrevActive=true;
}
else