svn commit: r718097 - in /ofbiz/branches/release4.0: ./ applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java

Author: jleroux
Date: Sun Nov 16 12:04:49 2008
New Revision: 718097

URL: http://svn.apache.org/viewvc?rev=718097&view=rev
Log:
Applied fix from trunk for revision: 629279

Modified:
    ofbiz/branches/release4.0/   (props changed)
    ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java

Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 16 12:04:49 2008
@@ -1 +1 @@
-/ofbiz/trunk:539836-539837,618970,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692
+/ofbiz/trunk:539836-539837,618970,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692

Modified: ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java?rev=718097&r1=718096&r2=718097&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java (original)
+++ ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java Sun Nov 16 12:04:49 2008
@@ -124,6 +124,8 @@
         Map currentAnswers = null;
         if (responseId != null && canUpdate()) {
             currentAnswers = this.getResponseAnswers(responseId);
+        } else {
+            currentAnswers = this.getResponseAnswers(null);
         }
         
         Map sqaaWithColIdListByMultiRespId = FastMap.newInstance();
@@ -310,9 +312,6 @@
 
     // returns a Map of answers keyed on SurveyQuestion ID from the most current SurveyResponse ID
     public Map getResponseAnswers(String responseId) throws SurveyWrapperException {
-        if (responseId == null) {
-            throw new SurveyWrapperException("Null response ID is not supported at this time");
-        }
 
         Map answerMap = new HashMap();