[jboss-cvs] JBossAS SVN: r109910 - in projects/jboss-jca/trunk/core/src: test/java/org/jboss/jca/core/connectionmanager/notx and 1 other directories.

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

Author: jesper.pedersen
Date: 2010-12-15 04:51:25 -0500 (Wed, 15 Dec 2010)
New Revision: 109910

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java
Log:
[JBJCA-477] ConnectionManager not completely serializable (revert to old behavior)

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java	2010-12-15 07:24:52 UTC (rev 109909)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java	2010-12-15 09:51:25 UTC (rev 109910)
@@ -28,6 +28,11 @@
 import org.jboss.jca.core.connectionmanager.listener.ConnectionState;
 import org.jboss.jca.core.connectionmanager.pool.api.Pool;
 
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -69,13 +74,13 @@
    private static final String SECURITY_MGR_PATH = "java:/jaas/";
    
    /** The pool */
-   private transient Pool pool;
+   private Pool pool;
    
    /** Security domain jndi name */
    private String securityDomainJndiName;
    
    /** SubjectFactory */
-   private transient SubjectFactory subjectFactory;
+   private SubjectFactory subjectFactory;
    
    /** Number of retry to allocate connection */
    private int allocationRetry;
@@ -87,7 +92,7 @@
    private AtomicBoolean shutdown = new AtomicBoolean(false);
    
    /** Cached connection manager */
-   private transient CachedConnectionManager cachedConnectionManager;
+   private CachedConnectionManager cachedConnectionManager;
    
    /** Jndi name */
    private String jndiName;
@@ -672,4 +677,34 @@
       
       return subject;
    }
+
+   /**
+    * Write the object to the stream -- THIS IS NOT SUPPORTED
+    * @param out The stream
+    * @exception IOException Thrown in case of an error
+    */
+   private void writeObject(ObjectOutputStream out) throws IOException
+   {
+      throw new IOException("This method is not supported");
+   }
+
+   /**
+    * Read the object from the stream -- THIS IS NOT SUPPORTED
+    * @param in The stream
+    * @exception IOException Thrown in case of an error
+    * @exception ClassNotFoundException Thrown if a class can't be resolved
+    */
+   private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
+   {
+      throw new IOException("This method is not supported");
+   }
+
+   /**
+    * Read the object -- THIS IS NOT SUPPORTED
+    * @exception ObjectStreamException Thrown in case of an error
+    */
+   private void readObjectNoData() throws ObjectStreamException
+   {
+      throw new NotSerializableException("This method is not supported");
+   }
 }

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java	2010-12-15 07:24:52 UTC (rev 109909)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java	2010-12-15 09:51:25 UTC (rev 109910)
@@ -30,6 +30,7 @@
 import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.ObjectOutputStream;
 
 import javax.resource.spi.ManagedConnectionFactory;
@@ -52,7 +53,7 @@
     * testSerializable.
     * @throws Throwable for exception
     */
-   @Test
+   @Test(expected = IOException.class)
    public void testSerializable() throws Throwable
    {
       ManagedConnectionFactory mcf = new MockManagedConnectionFactory();

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java	2010-12-15 07:24:52 UTC (rev 109909)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java	2010-12-15 09:51:25 UTC (rev 109910)
@@ -32,6 +32,7 @@
 import org.jboss.jca.embedded.EmbeddedFactory;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.net.URL;
 
@@ -59,7 +60,7 @@
     * testSerializable.
     * @throws Throwable for exception
     */
-   @Test
+   @Test(expected = IOException.class)
    public void testSerializable() throws Throwable
    {
       TransactionManager tm = embedded.lookup("RealTransactionManager", TransactionManager.class);