[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting ...
Tom Elrod
tom.elrod at jboss.com
Thu Jan 11 15:34:50 EST 2007
User: telrod
Date: 07/01/11 15:34:50
Modified: src/main/org/jboss/remoting Tag: remoting_2_x
AbstractInvoker.java InvokerRegistry.java
ServerInvoker.java
Log:
JBREM-659 - updated classloading to use Class.forName() instead of ClassLoader.loadClass() because the later is broken in jdk 1.6.
Revision Changes Path
No revision
No revision
1.12.4.6 +3 -13 JBossRemoting/src/main/org/jboss/remoting/AbstractInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/AbstractInvoker.java,v
retrieving revision 1.12.4.5
retrieving revision 1.12.4.6
diff -u -b -r1.12.4.5 -r1.12.4.6
--- AbstractInvoker.java 19 Dec 2006 05:58:56 -0000 1.12.4.5
+++ AbstractInvoker.java 11 Jan 2007 20:34:50 -0000 1.12.4.6
@@ -27,6 +27,7 @@
import org.jboss.remoting.marshal.MarshallLoaderFactory;
import org.jboss.remoting.security.SSLSocketBuilder;
import org.jboss.remoting.serialization.SerializationStreamFactory;
+import org.jboss.remoting.serialization.ClassLoaderUtility;
import org.jboss.remoting.callback.InvokerCallbackHandler;
import org.jboss.util.id.GUID;
@@ -47,7 +48,7 @@
*
* @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
* @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
- * @version $Revision: 1.12.4.5 $
+ * @version $Revision: 1.12.4.6 $
*/
public abstract class AbstractInvoker implements Invoker
{
@@ -280,20 +281,9 @@
String socketFactoryString = (String)configuration.get(Remoting.SOCKET_FACTORY_NAME);
if(socketFactoryString != null && socketFactoryString.length() > 0)
{
- //ClassLoader classLoader = invoker.getClassLoader();
- ClassLoader classLoader = null;
- if(classLoader == null)
- {
- classLoader = Thread.currentThread().getContextClassLoader();
-
- if(classLoader == null)
- {
- classLoader = getClass().getClassLoader();
- }
- }
try
{
- Class cl = classLoader.loadClass(socketFactoryString);
+ Class cl = ClassLoaderUtility.loadClass(socketFactoryString, getClass());
Constructor socketFactoryConstructor = null;
socketFactoryConstructor = cl.getConstructor(new Class[]{});
1.34.4.2 +2 -2 JBossRemoting/src/main/org/jboss/remoting/InvokerRegistry.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InvokerRegistry.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/InvokerRegistry.java,v
retrieving revision 1.34.4.1
retrieving revision 1.34.4.2
diff -u -b -r1.34.4.1 -r1.34.4.2
--- InvokerRegistry.java 10 Jan 2007 10:30:33 -0000 1.34.4.1
+++ InvokerRegistry.java 11 Jan 2007 20:34:50 -0000 1.34.4.2
@@ -48,7 +48,7 @@
*
* @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
* @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
- * @version $Revision: 1.34.4.1 $
+ * @version $Revision: 1.34.4.2 $
*/
public class InvokerRegistry
{
@@ -493,7 +493,7 @@
if(transportFactoryClass == null)
{
String transportFactoryClassName = "org.jboss.remoting.transport." + protocol + ".TransportClientFactory";
- transportFactoryClass = ClassLoaderUtility.loadClass(transportFactoryClassName, InvokerRegistry.class);
+ transportFactoryClass = ClassLoaderUtility.loadClass(InvokerRegistry.class, transportFactoryClassName);
transportClientFactoryClasses.put(protocol, transportFactoryClass);
}
return transportFactoryClass;
1.52.2.10 +4 -14 JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v
retrieving revision 1.52.2.9
retrieving revision 1.52.2.10
diff -u -b -r1.52.2.9 -r1.52.2.10
--- ServerInvoker.java 5 Jan 2007 16:01:10 -0000 1.52.2.9
+++ ServerInvoker.java 11 Jan 2007 20:34:50 -0000 1.52.2.10
@@ -34,6 +34,7 @@
import org.jboss.remoting.stream.StreamHandler;
import org.jboss.remoting.stream.StreamInvocationHandler;
import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.serialization.ClassLoaderUtility;
import org.jboss.util.threadpool.BasicThreadPool;
import org.jboss.util.threadpool.BlockingMode;
import org.jboss.util.threadpool.ThreadPool;
@@ -58,7 +59,7 @@
*
* @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
- * @version $Revision: 1.52.2.9 $
+ * @version $Revision: 1.52.2.10 $
*/
public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
{
@@ -428,20 +429,9 @@
// couldn't create from object name for mbean service, will try by class name
if(serverSocketFactory == null)
{
- //ClassLoader classLoader = invoker.getClassLoader();
- ClassLoader classLoader = null;
- if(classLoader == null)
- {
- classLoader = Thread.currentThread().getContextClassLoader();
-
- if(classLoader == null)
- {
- classLoader = getClass().getClassLoader();
- }
- }
try
{
- Class cl = classLoader.loadClass(serverSocketFactoryString);
+ Class cl = ClassLoaderUtility.loadClass(serverSocketFactoryString, getClass());
Constructor serverSocketConstructor = null;
serverSocketConstructor = cl.getConstructor(new Class[]{});
@@ -714,7 +704,7 @@
{
try
{
- onewayThreadPool = (ThreadPool) getClassLoader().loadClass(onewayThreadPoolClass).newInstance();
+ onewayThreadPool = (ThreadPool) Class.forName(onewayThreadPoolClass, false, getClassLoader()).newInstance();
}
catch(Exception e)
{
More information about the jboss-cvs-commits
mailing list