[weld-commits] Weld SVN: r5444 - in core/trunk: tests/src/test/java/org/jboss/weld/tests/serialization and 1 other directory.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-12 08:37:24 -0500 (Tue, 12 Jan 2010)
New Revision: 5444

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java
   core/trunk/impl/src/main/java/org/jboss/weld/conversation/ServletConversationManager.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java
Log:
make super class serializable

Modified: core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java	2010-01-12 13:30:08 UTC (rev 5443)
+++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java	2010-01-12 13:37:24 UTC (rev 5444)
@@ -35,6 +35,7 @@
 import static org.jboss.weld.logging.messages.ConversationMessage.NO_CONVERSATION_TO_RESTORE;
 import static org.jboss.weld.logging.messages.ConversationMessage.UNABLE_TO_RESTORE_CONVERSATION;
 
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
@@ -60,8 +61,11 @@
  * @author Nicklas Karlsson
  * 
  */
-public abstract class AbstractConversationManager implements ConversationManager
+public abstract class AbstractConversationManager implements ConversationManager, Serializable
 {
+   
+   private static final long serialVersionUID = 8375026855239413267L;
+
    private static final LocLogger log = loggerFactory().getLogger(CONVERSATION);
 
    // The current conversation

Modified: core/trunk/impl/src/main/java/org/jboss/weld/conversation/ServletConversationManager.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/conversation/ServletConversationManager.java	2010-01-12 13:30:08 UTC (rev 5443)
+++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/ServletConversationManager.java	2010-01-12 13:37:24 UTC (rev 5444)
@@ -22,8 +22,6 @@
  */
 package org.jboss.weld.conversation;
 
-import java.io.Serializable;
-
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.Produces;
@@ -40,7 +38,7 @@
  * 
  */
 @SessionScoped
-public class ServletConversationManager extends AbstractConversationManager implements Serializable
+public class ServletConversationManager extends AbstractConversationManager
 {
    private static final long serialVersionUID = 1647848566880659085L;
 

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java	2010-01-12 13:30:08 UTC (rev 5443)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java	2010-01-12 13:37:24 UTC (rev 5444)
@@ -1,10 +1,5 @@
 package org.jboss.weld.tests.serialization;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.weld.test.AbstractWeldTest;
 import org.testng.annotations.Test;
@@ -22,15 +17,8 @@
       assert cMgr.getConversationInstance() != null;
       assert cMgr.getConversationInstance().get() != null;
       
-      ByteArrayOutputStream serialized = new ByteArrayOutputStream();
-      ObjectOutputStream out = new ObjectOutputStream(serialized);
+      Object deserialized = deserialize(serialize(cMgr));
       
-      out.writeObject(cMgr);
-      out.flush();
-      
-      ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(serialized.toByteArray()));
-      Object deserialized = in.readObject();
-      
       assert deserialized instanceof TestConversationManager;
       TestConversationManager deserializedCMgr = (TestConversationManager) deserialized;
       assert deserializedCMgr.getConversationInstance() != null;

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java	2010-01-12 13:30:08 UTC (rev 5443)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java	2010-01-12 13:37:24 UTC (rev 5444)
@@ -2,14 +2,14 @@
 
 import java.lang.reflect.Field;
 
-import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Instance;
 
 import org.jboss.weld.conversation.AbstractConversationManager;
 import org.jboss.weld.conversation.ConversationImpl;
 import org.jboss.weld.conversation.ServletConversationManager;
 
- at SessionScoped
+ at Dependent
 public class TestConversationManager extends ServletConversationManager
 {