Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 41559 invoked from network); 1 Apr 2008 21:29:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Apr 2008 21:29:49 -0000 Received: (qmail 99338 invoked by uid 500); 1 Apr 2008 21:29:49 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 99141 invoked by uid 500); 1 Apr 2008 21:29:48 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 99130 invoked by uid 500); 1 Apr 2008 21:29:48 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 99127 invoked by uid 99); 1 Apr 2008 21:29:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 14:29:48 -0700 X-ASF-Spam-Status: No, hits=-2000.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; Tue, 01 Apr 2008 21:29:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7E76D1A9832; Tue, 1 Apr 2008 14:29:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r643585 - /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/InvocationHelper.java Date: Tue, 01 Apr 2008 21:29:24 -0000 To: axis2-cvs@ws.apache.org From: rott@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080401212925.7E76D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rott Date: Tue Apr 1 14:29:23 2008 New Revision: 643585 URL: http://svn.apache.org/viewvc?rev=643585&view=rev Log: AXIS2-3666 followup: more careful NPE prevention, just in case Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/InvocationHelper.java Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/InvocationHelper.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/InvocationHelper.java?rev=643585&r1=643584&r2=643585&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/InvocationHelper.java (original) +++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/InvocationHelper.java Tue Apr 1 14:29:23 2008 @@ -107,6 +107,10 @@ */ public static Throwable determineMappedException(Throwable t, MessageContext context) { EndpointInvocationContext eic = (EndpointInvocationContext)context.getInvocationContext(); + if (eic == null) { + eic = new EndpointInvocationContextImpl(); + eic.setRequestMessageContext(context); + } eic.setInvocationListeners((List)context.getProperty(org.apache.axis2.jaxws.spi.Constants.INVOCATION_LISTENER_LIST)); return determineMappedException(t, eic); } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org