[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/socket ...
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/transport/socket Tag:
remoting_2_x ServerThread.java
MicroSocketClientInvoker.java
SocketClientInvoker.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.29.2.5 +3 -13 JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerThread.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerThread.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerThread.java,v
retrieving revision 1.29.2.4
retrieving revision 1.29.2.5
diff -u -b -r1.29.2.4 -r1.29.2.5
--- ServerThread.java 21 Dec 2006 16:40:35 -0000 1.29.2.4
+++ ServerThread.java 11 Jan 2007 20:34:50 -0000 1.29.2.5
@@ -28,6 +28,7 @@
import org.jboss.remoting.InvocationResponse;
import org.jboss.remoting.ServerInvoker;
import org.jboss.remoting.Version;
+import org.jboss.remoting.serialization.ClassLoaderUtility;
import org.jboss.remoting.marshal.MarshalFactory;
import org.jboss.remoting.marshal.Marshaller;
import org.jboss.remoting.marshal.UnMarshaller;
@@ -58,7 +59,7 @@
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @author <a href="mailto:tom at jboss.org">Tom Elrod</a>
- * @version $Revision: 1.29.2.4 $
+ * @version $Revision: 1.29.2.5 $
*/
public class ServerThread extends Thread
{
@@ -183,20 +184,9 @@
{
if (serverSocketConstructor == null)
{
- //ClassLoader classLoader = invoker.getClassLoader();
- ClassLoader classLoader = null;
- if (classLoader == null)
- {
- classLoader = Thread.currentThread().getContextClassLoader();
-
- if (classLoader == null)
- {
- classLoader = getClass().getClassLoader();
- }
- }
if(serverSocketClass == null)
{
- serverSocketClass = classLoader.loadClass(serverSocketClassName);
+ serverSocketClass = ClassLoaderUtility.loadClass(serverSocketClassName, getClass());
}
try
1.16.2.4 +3 -12 JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MicroSocketClientInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -u -b -r1.16.2.3 -r1.16.2.4
--- MicroSocketClientInvoker.java 10 Jan 2007 10:30:33 -0000 1.16.2.3
+++ MicroSocketClientInvoker.java 11 Jan 2007 20:34:50 -0000 1.16.2.4
@@ -6,6 +6,7 @@
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.RemoteClientInvoker;
import org.jboss.remoting.Version;
+import org.jboss.remoting.serialization.ClassLoaderUtility;
import org.jboss.remoting.marshal.Marshaller;
import org.jboss.remoting.marshal.UnMarshaller;
import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
@@ -31,7 +32,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.16.2.3 $
+ * @version $Revision: 1.16.2.4 $
*/
public class MicroSocketClientInvoker extends RemoteClientInvoker
{
@@ -763,19 +764,9 @@
{
if (clientSocketConstructor == null)
{
- ClassLoader classLoader = getClassLoader();
- if (classLoader == null)
- {
- classLoader = Thread.currentThread().getContextClassLoader();
-
- if (classLoader == null)
- {
- classLoader = getClass().getClassLoader();
- }
- }
if(clientSocketClass == null)
{
- clientSocketClass = classLoader.loadClass(clientSocketClassName);
+ clientSocketClass = ClassLoaderUtility.loadClass(clientSocketClassName, getClass());
}
clientSocketConstructor = clientSocketClass.getConstructor(new Class[]{Socket.class});
1.38.2.2 +4 -13 JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketClientInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -b -r1.38.2.1 -r1.38.2.2
--- SocketClientInvoker.java 10 Jan 2007 10:30:33 -0000 1.38.2.1
+++ SocketClientInvoker.java 11 Jan 2007 20:34:50 -0000 1.38.2.2
@@ -24,6 +24,7 @@
import org.jboss.logging.Logger;
import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.serialization.ClassLoaderUtility;
import javax.net.SocketFactory;
import java.io.IOException;
@@ -39,7 +40,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.38.2.1 $
+ * @version $Revision: 1.38.2.2 $
*/
public class SocketClientInvoker extends MicroSocketClientInvoker
{
@@ -129,19 +130,9 @@
{
if (clientSocketConstructor == null)
{
- ClassLoader classLoader = getClassLoader();
- if (classLoader == null)
- {
- classLoader = Thread.currentThread().getContextClassLoader();
-
- if (classLoader == null)
- {
- classLoader = getClass().getClassLoader();
- }
- }
if(clientSocketClass == null)
{
- clientSocketClass = classLoader.loadClass(clientSocketClassName);
+ clientSocketClass = ClassLoaderUtility.loadClass(getClass(), clientSocketClassName);
}
try
More information about the jboss-cvs-commits
mailing list