Merge branch 'release/1.8.7'

* Adding hotfix commit for 1.8.7.1
akvo · Jun 11, 2015 · 571d1b1 · 571d1b1
2 parents 4756416 + fcad6cf
commit 571d1b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/GAE/src/com/gallatinsystems/gis/map/MapUtils.java b/GAE/src/com/gallatinsystems/gis/map/MapUtils.java
@@ -81,10 +81,13 @@ public static void recomputeCluster(Cache cache, SurveyedLocale locale, int delt
                     showOnPublicMap = (Boolean) cache.get(pubKey);
                 } else {
                     Survey s = sDao.getByKey(surveyId);
-                    SurveyGroup surveyGroup = SurveyUtils.retrieveSurveyGroup(s.getSurveyGroupId());
                     if (s != null) {
-                        showOnPublicMap = surveyGroup.getPrivacyLevel() == PrivacyLevel.PUBLIC;
-                        putObject(cache, pubKey, showOnPublicMap);
+                        SurveyGroup surveyGroup = SurveyUtils.retrieveSurveyGroup(s
+                                .getSurveyGroupId());
+                        if (surveyGroup != null) {
+                            showOnPublicMap = surveyGroup.getPrivacyLevel() == PrivacyLevel.PUBLIC;
+                            putObject(cache, pubKey, showOnPublicMap);
+                        }
                     }
                 }
             }

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -5,6 +5,12 @@ Read more about the [Akvo Platform](http://www.akvo.org/blog/?p=4822).
 
 Akvo FLOW Dashboard release notes
 ----
+#1.8.7.1
+Date: 11 June 2015
+
+# Resolved issues
+* Add check for missing survey when recomputing clusters #1302
+
 #1.8.7
 Date: 11 June 2015