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

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

Author: beve
Date: 2009-05-20 03:34:12 -0400 (Wed, 20 May 2009)
New Revision: 26629

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
Log:
Work for https://jira.jboss.org/jira/browse/JBESB-2519 "ServiceInvoker swallows exceptions"


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2009-05-20 07:33:20 UTC (rev 26628)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2009-05-20 07:34:12 UTC (rev 26629)
@@ -569,7 +569,9 @@
             try {
                 courier = getCourier(targetEPR);
             } catch (CourierException e) {
-                logger.debug("Courier lookup failed for EPR [" + targetEPR + "] for Service [" + service + "] and Message ["+message.getHeader()+"].", e);
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Courier lookup failed for EPR [" + targetEPR + "] for Service [" + service + "] and Message ["+message.getHeader()+"].", e);
+                }
             } catch (MalformedEPRException e) {
             	// probably an ESB-unaware EPR in the registry!!
 
@@ -611,7 +613,9 @@
                         replyToEPR = (currentReplyToEpr == null ? getReplyToAddress(targetEPR) : currentReplyToEpr) ;
 
                         if (replyToEPR == null) {
-                            logger.debug("Not using epr [" + targetEPR + "] for Service [" + service + "] and Message ["+message.getHeader()+"]. No reply-to address available for synchronous response.");
+                            if (logger.isDebugEnabled()) {
+                                logger.debug("Not using epr [" + targetEPR + "] for Service [" + service + "] and Message ["+message.getHeader()+"]. No reply-to address available for synchronous response.");
+                            }
                             return null;
                         }
                         call.setReplyTo(replyToEPR);
@@ -636,7 +640,9 @@
                 } catch (final CourierServiceBindException e) {
                     // meant to be masked by the SI fail-over
 
-                    logger.debug("Caught service lookup exception for EPR [" + targetEPR + "] and Service [" + service + "] and Message ["+message.getHeader()+"]. " + e.getMessage());
+                    if (logger.isDebugEnabled()) {
+                        logger.debug("Caught service lookup exception for EPR [" + targetEPR + "] and Service [" + service + "] and Message ["+message.getHeader()+"]. ", e);
+                    }
 
                     // could be stale EPR, so move on to next entry in registry.
                 } catch (final CourierMarshalUnmarshalException e) {
@@ -646,7 +652,9 @@
                 } catch (final CourierTransportException e) {
                     // meant to be masked by the SI fail-over
 
-                    logger.debug("Courier indicated transport related error "+e+" during send/receive with EPR [" + targetEPR + "] for Service [" + service + "] and Message ["+message.getHeader()+"]. " + e.getMessage());
+                    if (logger.isDebugEnabled()) {
+                        logger.debug("Courier indicated transport related error "+e+" during send/receive with EPR [" + targetEPR + "] for Service [" + service + "] and Message ["+message.getHeader()+"]. ", e);
+                    }
                 } catch (CourierException e) {
                     // probable config error. Log it and move on to next EPR/service entry.