You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/01/02 09:17:57 UTC
svn commit: r1554766 - in /ofbiz/branches/release12.04: ./
framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
Author: jleroux
Date: Thu Jan 2 08:17:57 2014
New Revision: 1554766
URL: http://svn.apache.org/r1554766
Log:
"Applied fix from trunk for revision: 1554764"
------------------------------------------------------------------------
r1554764 | jleroux | 2014-01-02 09:17:23 +0100 (jeu. 02 janv. 2014) | 1 ligne
Keeps the hack clean, sync is not needed here
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1554764
Modified: ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java?rev=1554766&r1=1554765&r2=1554766&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java (original)
+++ ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java Thu Jan 2 08:17:57 2014
@@ -147,11 +147,9 @@ public final class SetOperation extends
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) {
localeTemp = methodContext.getLocale();
- synchronized (this) {
- methodContext.setLocale(new Locale(this.localeFse.expandString(methodContext.getEnvMap())));
- newValue = this.fromFma.get(methodContext.getEnvMap());
- methodContext.setLocale(localeTemp);
- }
+ 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());
}