Merge pull request #942 from EyeSeeTea/code-v1.0

protection from badly configured server regarding CS added
EyeSeeTea · Apr 13, 2016 · b039bd4 · b039bd4
2 parents 44eb07c + c134452
commit b039bd4
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/app/src/main/java/org/eyeseetea/malariacare/layout/score/ScoreRegister.java b/app/src/main/java/org/eyeseetea/malariacare/layout/score/ScoreRegister.java
@@ -78,6 +78,11 @@ public static void deleteRecord(Question question){
 
     private static List<Float> getRecursiveScore(CompositeScore cScore, List<Float> result) {
 
+        //Protect from wrong server data
+        if (compositeScoreMap.get(cScore)==null) {
+            return Arrays.asList(new Float(0f),new Float(0f));
+        }
+
         //Sum its own records
         result=compositeScoreMap.get(cScore).calculateNumDenTotal(result);