svn commit: r574343 - /geronimo/server/branches/2.0/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java

[ga...@apache.org]

Author: gawor
Date: Mon Sep 10 12:24:39 2007
New Revision: 574343

URL: http://svn.apache.org/viewvc?rev=574343&view=rev
Log:
fix axis2 ws ejb exception handling (related to GERONIMO-3462)

Modified:
    geronimo/server/branches/2.0/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java

Modified: geronimo/server/branches/2.0/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java?rev=574343&r1=574342&r2=574343&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java Mon Sep 10 12:24:39 2007
@@ -36,6 +36,7 @@
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openejb.ApplicationException;
 import org.apache.openejb.DeploymentInfo;
 import org.apache.openejb.RpcContainer;
 
@@ -86,6 +87,12 @@
         try {
             Object res = container.invoke(this.deploymentInfo.getDeploymentID(), callInterface, method, arguments, null);
             // TODO: update response message with new response value?
+        } catch (ApplicationException e) {
+            if (e.getCause() instanceof AxisFault) {
+                throw (AxisFault)e.getCause();
+            } else {
+                throw AxisFault.makeFault(e);
+            }
         } catch (Exception e) {
             throw AxisFault.makeFault(e);
         }