[dcm4che-commits] SF.net SVN: dcm4che:[15653] dcm4chee/dcm4chee-arc/branches/AGILITY_DEV/ dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/BaseCmd.java

[<ga...@us...>]

Revision: 15653
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15653&view=rev
Author:   garyxu
Date:     2011-07-05 18:30:23 +0000 (Tue, 05 Jul 2011)

Log Message:
-----------
Revert changes from revision 15618. 

Revision Links:
--------------
    http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15618&view=rev

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/branches/AGILITY_DEV/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/BaseCmd.java

Modified: dcm4chee/dcm4chee-arc/branches/AGILITY_DEV/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/BaseCmd.java
===================================================================
--- dcm4chee/dcm4chee-arc/branches/AGILITY_DEV/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/BaseCmd.java	2011-07-05 13:51:05 UTC (rev 15652)
+++ dcm4chee/dcm4chee-arc/branches/AGILITY_DEV/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/BaseCmd.java	2011-07-05 18:30:23 UTC (rev 15653)
@@ -41,8 +41,6 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -51,7 +49,6 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.naming.NoInitialContextException;
 import javax.sql.DataSource;
 
 import org.apache.log4j.Logger;
@@ -110,9 +107,8 @@
 		if (sql != null)
 	        log.debug("SQL: " + sql);
 
-		try {
- 	   		 Context jndiCtx = getJndiContext();
- 	   		 
+ 	   	 try {
+	         Context jndiCtx = new InitialContext();
 	         try {
 	             ds = (DataSource) jndiCtx.lookup(dsJndiName);
 	         } finally {
@@ -129,56 +125,6 @@
         open();
     }
 
-    private Context getJndiContext() throws NamingException {
-
-    	Context jndiCtx = null;
-    	try{
-    		jndiCtx = new InitialContext();
-    	} catch(NoInitialContextException e){
-    		Throwable rootCause = e.getRootCause();
-    		if(rootCause instanceof ClassNotFoundException){
-    			// it might be a JBoss 5 class loading issue. See https://issues.jboss.org/browse/JBPAPP-4395
-    			if (rootCause.getMessage().trim().equals(System.getProperty(Context.INITIAL_CONTEXT_FACTORY))){
-    				ClassLoader oldCCL = Thread.currentThread().getContextClassLoader();
-    				ClassLoader cl = getClass().getClassLoader();
-
-    				log.warn("ContextClassLoader: " + toString(oldCCL)+ " wasn't able to load " + 
-    						rootCause.getMessage() +
-    						", retrying with BaseCmd's class loader: " + toString(cl));
-    				
-    				Thread.currentThread().setContextClassLoader(cl);
-    				try {
-    					jndiCtx = new InitialContext();
-    				} finally {
-    					Thread.currentThread().setContextClassLoader(oldCCL);
-    				}
-    			}
-    		} else{
-    			throw e;
-    		}
-    	}
-    	return jndiCtx;
-    }
-    
-    private String toString(ClassLoader cl) {
-    	StringBuilder sb = new StringBuilder();
-    	sb.append(cl.getClass().getName());
-    	if (cl instanceof URLClassLoader) {
-    		URLClassLoader ucl = (URLClassLoader)cl;
-    		URL[] urls = ucl.getURLs();
-    		sb.append(", URLs: ");
-    		if (urls != null) {
-    			for (URL url : urls) {
-    				sb.append(url);
-    				sb.append(", ");
-    			}
-    		} else {
-    			sb.append("NULL");
-    		}
-    	}
-    	return sb.toString();
-    }
-    
     public static String transactionIsolationLevelAsString(int level) {
         switch (level) {
         case 0:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.