midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating a generic improvement on Env class from Heng Sin - fixing an issue that could lead to context lost

This commit is contained in:
Carlos Ruiz 2017-05-19 11:13:20 +02:00
parent 61a383575b
commit 0eb6e9bf74
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.base/src/org/compiere/util/Env.java
View File

@ -48,6 +48,7 @@ import javax.swing.JFrame;
import org.adempiere.base.Core; import org.adempiere.base.Core;
import org.adempiere.base.IResourceFinder; import org.adempiere.base.IResourceFinder;
import org.adempiere.util.IProcessUI; import org.adempiere.util.IProcessUI;
import org.adempiere.util.ServerContext;
import org.adempiere.util.ServerContextProvider; import org.adempiere.util.ServerContextProvider;
import org.compiere.Adempiere; import org.compiere.Adempiere;
import org.compiere.db.CConnection; import org.compiere.db.CConnection;
@ -244,6 +245,11 @@ public final class Env
{ {
if (ctx == null) if (ctx == null)
throw new IllegalArgumentException ("Require Context"); throw new IllegalArgumentException ("Require Context");
//nothing to do if ctx is already the current context
if (ServerContext.getCurrentInstance() == ctx)
return;
getCtx().clear(); getCtx().clear();
getCtx().putAll(ctx); getCtx().putAll(ctx);
} // setCtx } // setCtx