Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 87978 invoked from network); 10 Sep 2007 19:24:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Sep 2007 19:24:15 -0000 Received: (qmail 98554 invoked by uid 500); 10 Sep 2007 19:24:08 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 98409 invoked by uid 500); 10 Sep 2007 19:24:08 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 98398 invoked by uid 99); 10 Sep 2007 19:24:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2007 12:24:08 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2007 19:25:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 556C51A9832; Mon, 10 Sep 2007 12:23:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r574341 - /geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java Date: Mon, 10 Sep 2007 19:23:52 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070910192352.556C51A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Sep 10 12:23:51 2007 New Revision: 574341 URL: http://svn.apache.org/viewvc?rev=574341&view=rev Log: fix axis2 ws ejb exception handling (related to GERONIMO-3462) Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java?rev=574341&r1=574340&r2=574341&view=diff ============================================================================== --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java (original) +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java Mon Sep 10 12:23:51 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); }