[jboss-cvs] jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/execution ...

[Max Rydahl Andersen]

  User: mandersen
  Date: 06/12/11 17:21:58

  Modified:    hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/execution 
                        DefaultExecutionContext.java
  Log:
  HBX-830  Database errors should not be displayed in Log Error view
  HBX-837 Have seperate logs per configuration
  
  Revision  Changes    Path
  1.3       +13 -3     jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/execution/DefaultExecutionContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DefaultExecutionContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/execution/DefaultExecutionContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- DefaultExecutionContext.java	7 Jul 2006 13:50:57 -0000	1.2
  +++ DefaultExecutionContext.java	11 Dec 2006 22:21:58 -0000	1.3
  @@ -22,18 +22,25 @@
   package org.hibernate.console.execution;
   
   import java.net.URLClassLoader;
  +import java.util.ArrayList;
  +import java.util.List;
   import java.util.Map;
   import java.util.WeakHashMap;
   
  -public class DefaultExecutionContext implements ExecutionContext {
  +import org.apache.log4j.NDC;
  +import org.hibernate.eclipse.logging.CurrentContext;
   
  +public class DefaultExecutionContext implements ExecutionContext {
   	
   	final private URLClassLoader configurationClassLoader;	
   	private volatile int installs;
   	private Map previousLoaders = new WeakHashMap();
   	
  -	public DefaultExecutionContext(URLClassLoader loader) {
  +	final String key;
  +	
  +	public DefaultExecutionContext(String key, URLClassLoader loader) {
   		configurationClassLoader = loader;
  +		this.key = key;
   	}
   
   	/* (non-Javadoc)
  @@ -45,6 +52,7 @@
   			previousLoaders.put(Thread.currentThread(), Thread.currentThread().getContextClassLoader() );
   			Thread.currentThread().setContextClassLoader(configurationClassLoader);
   		}		
  +		
   	}
   	
   	/* (non-Javadoc)
  @@ -52,11 +60,13 @@
   	 */
   	public Object execute(Command c) {
   		try {
  +			CurrentContext.push( key );
   			installLoader();
   			return c.execute();
   		} 
   		finally {
   			uninstallLoader();
  +			CurrentContext.pop();
   		}
   	}