ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jler...@apache.org
Subject svn commit: r1554707 - in /ofbiz/branches/release13.07: ./ framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
Date Thu, 02 Jan 2014 00:16:09 GMT
Author: jleroux
Date: Thu Jan  2 00:16:09 2014
New Revision: 1554707

URL: http://svn.apache.org/r1554707
Log:
"Applied fix from trunk for revision: 1554706" 
------------------------------------------------------------------------
r1554706 | jleroux | 2014-01-02 01:15:38 +0100 (jeu. 02 janv. 2014) | 1 ligne

This is a temporary hack waiting for a better geolocation data model, related with OFBIZ-5453
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1554706

Modified: ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java?rev=1554707&r1=1554706&r2=1554707&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
(original)
+++ ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
Thu Jan  2 00:16:09 2014
@@ -144,10 +144,17 @@ public final class SetOperation extends 
                 Debug.logWarning(exc, "Error evaluating scriptlet [" + this.scriptlet + "]:
" + exc, module);
             }
         } else if (!this.fromFma.isEmpty()) {
+            Locale localeTemp = null; // FIXME this is a temporary hack waiting for a better
geolocation data model, related with OFBIZ-5453
             if (!this.localeFse.isEmpty() && this.type.length() > 0) {
-                methodContext.setLocale(new Locale(this.localeFse.expandString(methodContext.getEnvMap())));
+                localeTemp = methodContext.getLocale();
+                synchronized (this) {
+                    methodContext.setLocale(new Locale(this.localeFse.expandString(methodContext.getEnvMap())));
+                    newValue = this.fromFma.get(methodContext.getEnvMap());
+                    methodContext.setLocale(localeTemp);
+                }
+            } else {
+                newValue = this.fromFma.get(methodContext.getEnvMap());
             }
-            newValue = this.fromFma.get(methodContext.getEnvMap());
             if (Debug.verboseOn())
                 Debug.logVerbose("In screen getting value for field from [" + this.fromFma.toString()
+ "]: " + newValue, module);
         } else if (!this.valueFse.isEmpty()) {



Mime
View raw message