[jboss-remoting-commits] JBoss Remoting SVN: r3476 - remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/java.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2008-02-22 04:45:44 -0500 (Fri, 22 Feb 2008)
New Revision: 3476

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/java/JavaSerializationManager.java
Log:
JBREM-900: receiveObjectVersion*_2() always update object stream's classloader.

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/java/JavaSerializationManager.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/java/JavaSerializationManager.java	2008-02-22 09:41:57 UTC (rev 3475)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/java/JavaSerializationManager.java	2008-02-22 09:45:44 UTC (rev 3476)
@@ -145,10 +145,7 @@
       Object obj = null;
       if(inputStream instanceof ObjectInputStreamWithClassLoader)
       {
-         if(((ObjectInputStreamWithClassLoader) inputStream).getClassLoader() == null)
-         {
-            ((ObjectInputStreamWithClassLoader) inputStream).setClassLoader(customClassLoader);
-         }
+         ((ObjectInputStreamWithClassLoader) inputStream).setClassLoader(customClassLoader);
          objInputStream = (ObjectInputStream) inputStream;
       }
       /*else if(inputStream instanceof JBossObjectInputStream)
@@ -205,10 +202,7 @@
       Object obj = null;
       if(inputStream instanceof ObjectInputStreamWithClassLoader)
       {
-         if(((ObjectInputStreamWithClassLoader) inputStream).getClassLoader() == null)
-         {
-            ((ObjectInputStreamWithClassLoader) inputStream).setClassLoader(customClassLoader);
-         }
+         ((ObjectInputStreamWithClassLoader) inputStream).setClassLoader(customClassLoader);
          objInputStream = (ObjectInputStream) inputStream;
       }
       /*else if(inputStream instanceof JBossObjectInputStream)