Merge pull request #105 from atolcd/atolcd-bug-fixes

Fix NPE when saving values in new iteration
sigmah-dev · Sep 11, 2017 · 30778ca · 30778ca
2 parents c632e87 + eda80d7
commit 30778ca
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/src/main/java/org/sigmah/client/ui/presenter/contact/ContactDetailsPresenter.java b/src/main/java/org/sigmah/client/ui/presenter/contact/ContactDetailsPresenter.java
@@ -620,8 +620,8 @@ protected void onCommandSuccess(ListResult<IterationChange> result) {
                   Iterator<ValueEvent> valuesIterator = valueChanges.iterator();
                   while (valuesIterator.hasNext()) {
                     ValueEvent valueEvent = valuesIterator.next();
-
-                    if (valueEvent.getIterationId() == iterationChange.getIterationId()) {
+                    Integer iterationId = valueEvent.getIterationId();
+                    if (iterationId != null && iterationId == iterationChange.getIterationId()) {
                       valuesIterator.remove();
                     }
                   }
@@ -634,7 +634,8 @@ protected void onCommandSuccess(ListResult<IterationChange> result) {
                   newIterationsTabItems.get(oldId).setIterationId(newId);
 
                   for (ValueEvent valueEvent : valueChanges) {
-                    if (valueEvent.getIterationId() == oldId) {
+                    Integer iterationId = valueEvent.getIterationId();
+                    if (iterationId != null && iterationId == oldId) {
                       valueEvent.setIterationId(newId);
                     }
                   }

diff --git a/src/main/java/org/sigmah/client/ui/presenter/orgunit/OrgUnitDetailsPresenter.java b/src/main/java/org/sigmah/client/ui/presenter/orgunit/OrgUnitDetailsPresenter.java
@@ -546,8 +546,8 @@ protected void onCommandSuccess(ListResult<IterationChange> result) {
 								Iterator<ValueEvent> valuesIterator = valueChanges.iterator();
 								while (valuesIterator.hasNext()) {
 									ValueEvent valueEvent = valuesIterator.next();
-
-									if (valueEvent.getIterationId() == iterationChange.getIterationId()) {
+									Integer iterationId = valueEvent.getIterationId();
+									if (iterationId != null && iterationId == iterationChange.getIterationId()) {
 										valuesIterator.remove();
 									}
 								}
@@ -561,7 +561,8 @@ protected void onCommandSuccess(ListResult<IterationChange> result) {
 								newIterationsTabItems.get(oldId).setIterationId(newId);
 
 								for (ValueEvent valueEvent : valueChanges) {
-									if (valueEvent.getIterationId() == oldId) {
+									Integer iterationId = valueEvent.getIterationId();
+									if (iterationId != null && iterationId == oldId) {
 										valueEvent.setIterationId(newId);
 									}
 								}

diff --git a/src/main/java/org/sigmah/client/ui/presenter/project/ProjectDetailsPresenter.java b/src/main/java/org/sigmah/client/ui/presenter/project/ProjectDetailsPresenter.java
@@ -580,8 +580,8 @@ protected void onCommandSuccess(ListResult<IterationChange> result) {
 							Iterator<ValueEvent> valuesIterator = valueChanges.iterator();
 							while (valuesIterator.hasNext()) {
 								ValueEvent valueEvent = valuesIterator.next();
-
-								if (valueEvent.getIterationId() == iterationChange.getIterationId()) {
+								Integer iterationId = valueEvent.getIterationId();
+								if (iterationId != null && iterationId == iterationChange.getIterationId()) {
 									valuesIterator.remove();
 								}
 							}
@@ -594,7 +594,8 @@ protected void onCommandSuccess(ListResult<IterationChange> result) {
 							newIterationsTabItems.get(oldId).setIterationId(newId);
 
 							for (ValueEvent valueEvent : valueChanges) {
-								if (valueEvent.getIterationId() == oldId) {
+								Integer iterationId = valueEvent.getIterationId();
+								if (iterationId != null && iterationId == oldId) {
 									valueEvent.setIterationId(newId);
 								}
 							}

diff --git a/src/main/java/org/sigmah/client/ui/presenter/project/dashboard/PhasesPresenter.java b/src/main/java/org/sigmah/client/ui/presenter/project/dashboard/PhasesPresenter.java
@@ -1521,8 +1521,8 @@ private void updateLayoutGroupIteration(ListResult<IterationChange> result) {
 				Iterator<ValueEvent> valuesIterator = valueChanges.iterator();
 				while (valuesIterator.hasNext()) {
 					ValueEvent valueEvent = valuesIterator.next();
-
-					if (valueEvent.getIterationId() == iterationChange.getIterationId()) {
+					Integer iterationId = valueEvent.getIterationId();
+					if (iterationId != null && iterationId == iterationChange.getIterationId()) {
 						valuesIterator.remove();
 					}
 				}
@@ -1535,7 +1535,8 @@ private void updateLayoutGroupIteration(ListResult<IterationChange> result) {
 				newIterationsTabItems.get(oldId).setIterationId(newId);
 
 				for (ValueEvent valueEvent : valueChanges) {
-					if (valueEvent.getIterationId() == oldId) {
+					Integer iterationId = valueEvent.getIterationId();
+					if (iterationId != null && iterationId == oldId) {
 						valueEvent.setIterationId(newId);
 					}
 				}