Bugfix: Nullpointerexception when adding a webform via drag & drop +

increased version number to 2.0.1
alkacon · Jun 23, 2014 · 9e81ceb · 9e81ceb
1 parent ab1e0f7
commit 9e81ceb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/com.alkacon.opencms.v8.registration/resources/manifest.xml b/com.alkacon.opencms.v8.registration/resources/manifest.xml
@@ -16,7 +16,7 @@
 		<description><![CDATA[<p>This module contains a webuser registration framework for OpenCms.</p>
 <p>This module can easily be used to create a portal like site.</p>
 <p><i>(c) 2011 by Alkacon Software GmbH (http://www.alkacon.com).</i></p>]]></description>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 		<authorname><![CDATA[Alkacon Software GmbH]]></authorname>
 		<authoremail><![CDATA[info@alkacon.com]]></authoremail>
 		<datecreated/>

diff --git a/...ation/resources/system/modules/com.alkacon.opencms.v8.registration/pages/registration.jsp b/...ation/resources/system/modules/com.alkacon.opencms.v8.registration/pages/registration.jsp
@@ -21,15 +21,13 @@
 		// initialize the form handler
 		regForm = (CmsRegistrationFormHandler)CmsFormHandlerFactory.create(pageContext, request, response, CmsRegistrationFormHandler.class.getName(), (String)pageContext.getAttribute("uri"));
 		%>
+		<cms:formatter var="content" val="value">
+			<div>
+				<%
+				regForm.createForm();
+				%>
+			</div>
+		</cms:formatter>
 	</c:otherwise>
 </c:choose>
 
-
-<cms:formatter var="content" val="value">
-	<div>
-		<%
-		regForm.createForm();
-		%>
-	</div>
-</cms:formatter>
-
diff --git a/....opencms.v8.registration/src/com/alkacon/opencms/v8/registration/CmsRegistrationForm.java b/....opencms.v8.registration/src/com/alkacon/opencms/v8/registration/CmsRegistrationForm.java
@@ -213,6 +213,7 @@ public void init(CmsFormHandler jsp, CmsMessages messages, boolean initial, Stri
         if (CmsStringUtil.isEmpty(formConfigUri)) {
             formConfigUri = jsp.getRequestContext().getUri();
         }
+        m_configUri = formConfigUri;
         CmsFile file = jsp.getCmsObject().readFile(formConfigUri);
         CmsXmlContent content = CmsXmlContentFactory.unmarshal(jsp.getCmsObject(), file);
 

diff --git a/...s.v8.registration/src/com/alkacon/opencms/v8/registration/CmsRegistrationFormHandler.java b/...s.v8.registration/src/com/alkacon/opencms/v8/registration/CmsRegistrationFormHandler.java
@@ -404,7 +404,7 @@ protected void configureForm(HttpServletRequest req, String formConfigUri) throw
         } else {
             req.getSession().removeAttribute(ATTRIBUTE_FILEITEMS);
         }
-        String formAction = getParameter(PARAM_FORMACTION);
+        String formAction = getRequest().getParameter(PARAM_FORMACTION);
         m_isValidatedCorrect = null;
         setInitial(CmsStringUtil.isEmpty(formAction));
         // get the localized messages