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

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

Author: kevin.conner at jboss.com
Date: 2010-03-05 07:10:53 -0500 (Fri, 05 Mar 2010)
New Revision: 31957

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTransport.java
Log:
Move null check: JBESB-2868

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTransport.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTransport.java	2010-03-05 12:03:00 UTC (rev 31956)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTransport.java	2010-03-05 12:10:53 UTC (rev 31957)
@@ -370,6 +370,10 @@
         try
         {
             entry = serviceIdToEntry.get(serviceId) ;
+            if (entry == null)
+            {
+                throw new InVMException("Could not locate service entry for epr " + inVMEpr) ;
+            }
             passByValue = entry.isPassByValue() ;
             lockstep = entry.getLockstep() ;
         }
@@ -377,10 +381,6 @@
         {
             releaseReadLock() ;
         }
-        if (entry == null)
-        {
-            throw new InVMException("Could not locate service entry for epr " + inVMEpr) ;
-        }
         
         final Object addedObject ;
         if (passByValue)