[jboss-remoting-commits] JBoss Remoting SVN: r3477 - remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/jboss.
Author: ron.sigal(a)jboss.com
Date: 2008-02-22 04:48:06 -0500 (Fri, 22 Feb 2008)
New Revision: 3477
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java
Log:
JBREM-900: receiveObject() always update object stream's classloader.
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java
===================================================================
---
remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java 2008-02-22
09:45:44 UTC (rev 3476)
+++
remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java 2008-02-22
09:48:06 UTC (rev 3477)
@@ -97,18 +97,12 @@
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)
{
- if (((JBossObjectInputStream) inputStream).getClassLoader() == null)
- {
- ((JBossObjectInputStream) inputStream).setClassLoader(customClassLoader);
- }
+ ((JBossObjectInputStream) inputStream).setClassLoader(customClassLoader);
objInputStream = (ObjectInputStream) inputStream;
}
else if (inputStream instanceof ObjectInputStream)