You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2010/07/21 17:38:33 UTC
svn commit: r966282 -
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
Author: erwan
Date: Wed Jul 21 15:38:33 2010
New Revision: 966282
URL: http://svn.apache.org/viewvc?rev=966282&view=rev
Log:
Correction for r966123, parametersMapAcsr could be null
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=966282&r1=966281&r2=966282&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Wed Jul 21 15:38:33 2010
@@ -751,11 +751,13 @@ public class ModelMenuItem {
public Map<String, String> getParameterMap(Map<String, Object> context) {
Map<String, String> fullParameterMap = FastMap.newInstance();
- Map<String, String> addlParamMap = this.parametersMapAcsr.get(context);
- if (addlParamMap != null) {
- fullParameterMap.putAll(addlParamMap);
+ if (this.parametersMapAcsr != null) {
+ Map<String, String> addlParamMap = this.parametersMapAcsr.get(context);
+ if (addlParamMap != null) {
+ fullParameterMap.putAll(addlParamMap);
+ }
}
-
+
for (WidgetWorker.Parameter parameter: this.parameterList) {
fullParameterMap.put(parameter.getName(), parameter.getValue(context));
}