svn commit: r765048 - /ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java

[midon]

Author: midon
Date: Wed Apr 15 04:44:22 2009
New Revision: 765048

URL: http://svn.apache.org/viewvc?rev=765048&view=rev
Log:
Timeout exception does not need extra wrapping

Modified:
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java?rev=765048&r1=765047&r2=765048&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java 
(original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java Wed Apr 
15 04:44:22 2009
@@ -110,14 +110,9 @@
 
             odeMex.setRequest(odeRequest);
             odeMex.setTimeout(resolveTimeout());
-            try {
                 if(__log.isDebugEnabled()) __log.debug("Blocking invoke with 
mex " + odeMex.getMessageExchangeId() + ".");
                 odeMex.invokeBlocking();
-            } catch (java.util.concurrent.TimeoutException te) {
-                String errmsg = "Call to " + _serviceName + "." + 
odeMex.getOperationName() + " timed out(" + resolveTimeout() + " ms).";
-                __log.error(errmsg, te);
-                throw new OdeFault(errmsg);         
-            }
+
             
             if (odeMex.getOperation().getOutput() != null && outMsgContext != 
null) {
                 SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
@@ -127,6 +122,10 @@
                 __log.debug("Handling response for MEX " + odeMex);
                 onResponse(odeMex, outMsgContext);
             }
+        } catch (java.util.concurrent.TimeoutException te) {
+            String errmsg = "Call to " + _serviceName + "." + 
odeMex.getOperationName() + " timed out(" + resolveTimeout() + " ms).";
+            __log.error(errmsg, te);
+            throw new OdeFault(errmsg);
         } catch (Exception e) {
             String errmsg = "Call to " + _serviceName + "." + 
odeMex.getOperationName() + " caused an exception.";
             __log.error(errmsg, e);