Author: erwan
Date: Wed Mar 31 15:09:59 2010
New Revision: 929576
URL:
http://svn.apache.org/viewvc?rev=929576&view=revLog:
Fixing a NPE introduced at rev.929173
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=929576&r1=929575&r2=929576&view=diff==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Wed Mar 31 15:09:59 2010
@@ -2691,7 +2691,9 @@ public class MacroFormRenderer implement
String urlPath = UtilHttp.removeQueryStringFromTarget(targetService);
String prepLinkText = UtilHttp.getQueryStringFromTarget(targetService);
- queryString = UtilHttp.encodeAmpersands(queryString);
+ if (UtilValidate.isNotEmpty(queryString)) {
+ queryString = UtilHttp.encodeAmpersands(queryString);
+ }
if (prepLinkText == null) {
prepLinkText = "";