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

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

Author: mark.little at jboss.com
Date: 2008-08-16 04:29:37 -0400 (Sat, 16 Aug 2008)
New Revision: 21578

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

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java	2008-08-16 08:06:46 UTC (rev 21577)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java	2008-08-16 08:29:37 UTC (rev 21578)
@@ -223,6 +223,9 @@
         try
         {
             millis = Math.max(millis, 100);
+            
+            Object messageObj = null;
+            
             synchronized (messageQueue) {
                 if (messageQueue.isEmpty()) {
                     try {
@@ -232,19 +235,19 @@
                     }
                 }
                 if (!messageQueue.isEmpty()) {
-                    Object messageObj = messageQueue.remove();
-
-                    if(messageObj instanceof byte[]) {
-                        message = MessageSerializer.deserialize((byte[]) messageObj);
-                    } else {
-                        message = (Message) messageObj;
-                    }
+                    messageObj = messageQueue.remove();
                 }
 
                 // Notify 1 waiting delivery thread of the pickup...
                 messageQueue.notify();
             }
 
+            if(messageObj instanceof byte[]) {
+                message = MessageSerializer.deserialize((byte[]) messageObj);
+            } else {
+                message = (Message) messageObj;
+            }
+            
             if ((message != null) && isTransactional())
             {
                 /*