RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug #1538: Detect inconsistent states on unsaved scheduling points.

Browse source 
FEA: ItEr77S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-10-01 13:46:53 +02:00
parent 35f7fca342
commit b7d612b655
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
View file

@ -316,7 +316,7 @@ public abstract class OrderElement extends IntegrationEntity implements
} else if (isSuperElementPartialOrCompletelyScheduled()) {
removeUnscheduled(result);
if (wasASchedulingPoint()) {
result.add(taskSourceRemoval());
removeTaskSource(result);
} else {
if (hadATaskSource() && currentTaskSourceIsNotTheSame()) {
//all the children of this element were unscheduled and then scheduled again,
@ -350,6 +350,14 @@ public abstract class OrderElement extends IntegrationEntity implements
}
private boolean wasASchedulingPoint() {
TaskSource currentTaskSource = getTaskSource();
// check if the existing TaskSource is inconsistent with the current
// scheduling state
if (currentTaskSource != null && currentTaskSource.getTask().isLeaf()
&& getSchedulingStateType() != Type.SCHEDULING_POINT) {
return true;
}
// check if the scheduling state has changed WRT the DB
SchedulingDataForVersion currentVersionOnDB = getCurrentVersionOnDB();
return SchedulingState.Type.SCHEDULING_POINT == currentVersionOnDB
.getSchedulingStateType();