diff --git a/GAE/src/org/waterforpeople/mapping/domain/SurveyInstance.java b/GAE/src/org/waterforpeople/mapping/domain/SurveyInstance.java index cadf421c92..7626d21510 100644 --- a/GAE/src/org/waterforpeople/mapping/domain/SurveyInstance.java +++ b/GAE/src/org/waterforpeople/mapping/domain/SurveyInstance.java @@ -307,7 +307,8 @@ public void setLocaleGeoLocation(String localeGeoLocation) { } public String getSurveyedLocaleDisplayName() { - if (surveyedLocaleDisplayName == null) { + // If the name is not set yet, try to build it based on existing QAS (if stored on the DB) + if (surveyedLocaleDisplayName == null && key != null) { QuestionDao qDao = new QuestionDao(); StringBuilder displayName = new StringBuilder(); if (this.surveyId != null) { diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 6d77e88da8..9497911db8 100644 --- 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.9.1.1 +Date: 7 October 2015 + +# Resolved issues +* NPE when accessing the SurveyInstance Key before it's saved into the datastore [#1432] + #1.9.1 Date: 6 October 2015