[jboss-cvs] JBoss Messaging SVN: r2294 - trunk/src/main/org/jboss/jms/wireformat.

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

Author: timfox
Date: 2007-02-13 07:40:59 -0500 (Tue, 13 Feb 2007)
New Revision: 2294

Modified:
   trunk/src/main/org/jboss/jms/wireformat/SerializedPacket.java
Log:

http://jira.jboss.org/jira/browse/JBMESSAGING-831


Modified: trunk/src/main/org/jboss/jms/wireformat/SerializedPacket.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/SerializedPacket.java	2007-02-13 12:15:50 UTC (rev 2293)
+++ trunk/src/main/org/jboss/jms/wireformat/SerializedPacket.java	2007-02-13 12:40:59 UTC (rev 2294)
@@ -26,6 +26,9 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+import org.jboss.logging.Logger;
+import org.jboss.remoting.loading.ObjectInputStreamWithClassLoader;
+
 /**
  * For carrying a remoting non JBM invocation across the wire
  * 
@@ -41,6 +44,9 @@
  */
 public class SerializedPacket extends PacketSupport
 {
+   private static final Logger log = Logger.getLogger(SerializedPacket.class);
+
+   
    private Object payload;
    
    public SerializedPacket()
@@ -71,11 +77,11 @@
 //      
 //      ObjectInputStream ois = new ObjectInputStream(bais);
 //      
-//      payload = ois.readObject();         
+//      payload = ois.readObject();     
+           
+      ObjectInputStream ois = new ObjectInputStreamWithClassLoader(is, Thread.currentThread().getContextClassLoader());
       
-      ObjectInputStream ois = new ObjectInputStream(is);
-      
-      payload = ois.readObject();   
+      payload = ois.readObject();
    }
 
    public void write(DataOutputStream os) throws Exception
@@ -103,8 +109,8 @@
       ObjectOutputStream oos = new ObjectOutputStream(os);
       
       oos.writeObject(payload);
-    
-      oos.flush();
+      
+      os.flush();
    }
 
 }