[jboss-cvs] JBoss Messaging SVN: r8430 - in branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888: src/main/org/jboss/jms/message and 1 other directories.

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

Author: jbertram
Date: 2011-08-29 11:53:58 -0400 (Mon, 29 Aug 2011)
New Revision: 8430

Modified:
   branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888/
   branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888/src/main/org/jboss/jms/message/MessageProxy.java
   branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java
Log:
JBPAPP-7090


Property changes on: branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/JBM1842:8169-8232
   + /branches/Branch_1_4:8385
/branches/JBM1842:8169-8232

Modified: branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888/src/main/org/jboss/jms/message/MessageProxy.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888/src/main/org/jboss/jms/message/MessageProxy.java	2011-08-29 15:01:14 UTC (rev 8429)
+++ branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888/src/main/org/jboss/jms/message/MessageProxy.java	2011-08-29 15:53:58 UTC (rev 8430)
@@ -96,7 +96,7 @@
    
    protected JBossMessage message;
    
-   private Object source;
+   private transient Object source;
 
    // Constructors --------------------------------------------------
 

Modified: branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java	2011-08-29 15:01:14 UTC (rev 8429)
+++ branches/Branch_JBossMessaging_1_4_8_SP1_JBMESSAGING-1888/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java	2011-08-29 15:53:58 UTC (rev 8430)
@@ -22,10 +22,18 @@
 package org.jboss.test.messaging.jms.message;
 
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import javax.jms.DeliveryMode;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.TextMessage;
 
+import org.jboss.jms.message.MessageProxy;
+
 /**
  * A test that sends/receives text messages to the JMS provider and verifies their integrity.
  *
@@ -75,6 +83,26 @@
       assertEquals("something", rm.getText());
    }
    
+   //JBMESSAGING-1888
+   public void testMessageSerializable() throws Exception
+   {
+      queueProd.send(message);
+      
+      log.debug("Message sent");
+
+      Message r = queueCons.receive();
+      
+      log.debug("Message received");
+      
+      ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+      ObjectOutputStream cloneOut = new ObjectOutputStream(byteOut);
+      cloneOut.writeObject(r);
+      cloneOut.close();
+      ObjectInputStream inputArray = new ObjectInputStream (new ByteArrayInputStream(byteOut.toByteArray()));
+      Message clone = (Message)inputArray.readObject();      
+      log.info("cloned message: " + clone);
+   }
+   
    // Protected -----------------------------------------------------
 
    protected void prepareMessage(Message m) throws JMSException