Return-Path: Delivered-To: apmail-ws-wsrf-commits-archive@www.apache.org Received: (qmail 65125 invoked from network); 12 Sep 2005 19:09:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Sep 2005 19:09:59 -0000 Received: (qmail 86719 invoked by uid 500); 12 Sep 2005 19:09:47 -0000 Delivered-To: apmail-ws-wsrf-commits-archive@ws.apache.org Received: (qmail 86664 invoked by uid 500); 12 Sep 2005 19:09:47 -0000 Mailing-List: contact wsrf-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: wsrf-dev@ws.apache.org Delivered-To: mailing list wsrf-commits@ws.apache.org Received: (qmail 86650 invoked by uid 500); 12 Sep 2005 19:09:46 -0000 Delivered-To: apmail-ws-wsrf-cvs@ws.apache.org Received: (qmail 86646 invoked by uid 99); 12 Sep 2005 19:09:46 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 12 Sep 2005 12:09:46 -0700 Received: (qmail 65093 invoked by uid 65534); 12 Sep 2005 19:09:46 -0000 Message-ID: <20050912190946.65090.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r280395 - in /webservices/wsrf/trunk/src: java/org/apache/ws/resource/handler/ResourceHandler.java sandbox/was-ejb.xml Date: Mon, 12 Sep 2005 19:09:45 -0000 To: wsrf-cvs@ws.apache.org From: ips@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ips Date: Mon Sep 12 12:09:41 2005 New Revision: 280395 URL: http://svn.apache.org/viewcvs?rev=280395&view=rev Log: fixed NPE in handleResponse() that was occurring for one-way operations Added: webservices/wsrf/trunk/src/sandbox/was-ejb.xml Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/ResourceHandler.java Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/ResourceHandler.java URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/ResourceHandler.java?rev=280395&r1=280394&r2=280395&view=diff ============================================================================== --- webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/ResourceHandler.java (original) +++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/ResourceHandler.java Mon Sep 12 12:09:41 2005 @@ -216,13 +216,14 @@ try { LOG.debug( MSG.getMessage( Keys.HANDLING_RESPONSE ) ); - SOAPEnvelope responseEnvelope = getResponseEnvelope( (SOAPMessageContext) msgContext ); - addWsaHeaderElementsToResponse( msgContext, responseEnvelope ); - List responseBodyElems = (List) msgContext.getProperty( WSRF_RESPONSE_XMLOBJECT_LIST ); - LOG.debug( MSG.getMessage( Keys.FOUND_RESP_ELEMS, - Integer.toString( responseBodyElems.size( ) ) ) ); + List responseBodyElems = (List) msgContext.getProperty( WSRF_RESPONSE_XMLOBJECT_LIST ); if ( responseBodyElems != null ) { + SOAPEnvelope responseEnvelope = getResponseEnvelope( (SOAPMessageContext) msgContext ); + addWsaHeaderElementsToResponse( msgContext, responseEnvelope ); + + LOG.debug( MSG.getMessage( Keys.FOUND_RESP_ELEMS, + Integer.toString( responseBodyElems.size( ) ) ) ); SOAPBody responseBody = responseEnvelope.getBody( ); for ( int i = 0; i < responseBodyElems.size( ); i++ ) { @@ -234,10 +235,15 @@ responseBody.addChildElement( soapBodyElement ); } } + if ( LOG.isDebugEnabled( ) ) + { + LOG.debug( "Sending SOAP response: \n" + responseEnvelope ); + } } - if ( LOG.isDebugEnabled( ) ) + else // one-way MEP { - LOG.debug( "Sending SOAP response: \n" + responseEnvelope ); + // a null message tells the SOAP engine to return an empty HTTP response with a 202 status code + ((SOAPMessageContext)msgContext).setMessage( null ); } } catch ( Exception e ) Added: webservices/wsrf/trunk/src/sandbox/was-ejb.xml URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/sandbox/was-ejb.xml?rev=280395&view=auto ============================================================================== --- webservices/wsrf/trunk/src/sandbox/was-ejb.xml (added) +++ webservices/wsrf/trunk/src/sandbox/was-ejb.xml Mon Sep 12 12:09:41 2005 @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + +