[jboss-svn-commits] JBL Code SVN: r22710 - labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers.

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

Author: mark.little at jboss.com
Date: 2008-09-12 06:39:51 -0400 (Fri, 12 Sep 2008)
New Revision: 22710

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java
Log:
https://jira.jboss.org/jira/browse/JBESB-1941

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java	2008-09-12 10:34:42 UTC (rev 22709)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java	2008-09-12 10:39:51 UTC (rev 22710)
@@ -153,14 +153,23 @@
             }
             else
             {
+                Object addedObject;
+                
+                if (passByValue) {
+                    try {
+                        addedObject = MessageSerializer.serialize(message);
+                    } catch (IOException ex) {
+                        logger.warn("Could not serialize message to pass by value.", ex);
+                        return false;
+                    }
+                } else {
+                    addedObject = message;
+                }
+                
                 synchronized (messageQueue) {
 
-                    Object addedObject = addMessageToQueue(message);
+                    messageQueue.add(addedObject);
 
-                    if (addedObject == null) {
-                        return false;
-                    }
-
                     // Notify 1 waiting pickup thread of the delivery...
                     messageQueue.notify();