svn commit: r926748 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java

[db...@apache.org]

Author: dblevins
Date: Tue Mar 23 19:37:28 2010
New Revision: 926748

URL: http://svn.apache.org/viewvc?rev=926748&view=rev
Log:
OPENEJB-1245: Possible Stateful bean passivation/activation error: ClassNotFoundException

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java?rev=926748&r1=926747&r2=926748&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java Tue Mar 23 19:37:28 2010
@@ -21,11 +21,16 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.InputStream;
+import java.io.BufferedInputStream;
+import java.io.OutputStream;
+import java.io.BufferedOutputStream;
 import java.util.Map;
 import java.util.Properties;
 
 import org.apache.openejb.SystemException;
 import org.apache.openejb.core.EnvProps;
+import org.apache.openejb.core.ivm.EjbObjectInputStream;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
@@ -65,7 +70,9 @@ public class SimplePassivater implements
             File sessionFile = new File(sessionDirectory, filename);
 
             logger.info("Passivating to file " + sessionFile);
-            ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(sessionFile));
+            OutputStream out = new FileOutputStream(sessionFile);
+            out = new BufferedOutputStream(out);
+            ObjectOutputStream oos = new ObjectOutputStream(out);
 
             oos.writeObject(state);// passivate just the bean instance
             oos.close();
@@ -94,7 +101,9 @@ public class SimplePassivater implements
             if (sessionFile.exists()) {
                 logger.info("Activating from file " + sessionFile);
 
-                ObjectInputStream ois = new ObjectInputStream(new FileInputStream(sessionFile));
+                InputStream in = new FileInputStream(sessionFile);
+                in = new BufferedInputStream(in);
+                ObjectInputStream ois = new EjbObjectInputStream(in);
                 Object state = ois.readObject();
                 ois.close();
                 sessionFile.delete();