svn commit: r939967 - /ofbiz/branches/release10.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java

[lektran]

Author: lektran
Date: Sat May  1 10:10:17 2010
New Revision: 939967

URL: http://svn.apache.org/viewvc?rev=939967&view=rev
Log:
(first!) Merged from trunk r939966:
Fix problem where inlined simple map processors weren't being given the locale correctly, reported by Saad Hage on the user list

Modified:
    ofbiz/branches/release10.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java

Modified: ofbiz/branches/release10.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java?rev=939967&r1=939966&r2=939967&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java (original)
+++ ofbiz/branches/release10.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java Sat May  1 10:10:17 2010
@@ -100,9 +100,7 @@ public class CallSimpleMapProcessor exte
 
         // run inlined map processor last so it can override the external map processor
         if (inlineMapProcessor != null) {
-            inlineMapProcessor.exec(inMap, outMap, messages,
-                (methodContext.getRequest() != null ? methodContext.getRequest().getLocale() : null),
-                methodContext.getLoader());
+            inlineMapProcessor.exec(inMap, outMap, messages, methodContext.getLocale(), methodContext.getLoader());
         }
 
         return true;