Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 44114 invoked from network); 20 Apr 2009 18:28:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Apr 2009 18:28:35 -0000 Received: (qmail 58160 invoked by uid 500); 20 Apr 2009 18:28:35 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 58053 invoked by uid 500); 20 Apr 2009 18:28:34 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 58044 invoked by uid 99); 20 Apr 2009 18:28:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2009 18:28:34 +0000 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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2009 18:28:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2D43223889D9; Mon, 20 Apr 2009 18:28:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r766783 - in /cxf/branches/2.1.x-fixes: ./ rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Date: Mon, 20 Apr 2009 18:28:13 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090420182813.2D43223889D9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Apr 20 18:28:12 2009 New Revision: 766783 URL: http://svn.apache.org/viewvc?rev=766783&view=rev Log: Merged revisions 766770 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r766770 | dkulp | 2009-04-20 13:37:03 -0400 (Mon, 20 Apr 2009) | 2 lines [CXF-2128] Add an npe guard ........ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 20 18:28:12 2009 @@ -1 +1 @@ -/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763 +/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java?rev=766783&r1=766782&r2=766783&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java (original) +++ cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Mon Apr 20 18:28:12 2009 @@ -872,7 +872,7 @@ } if (soapBindingInfo != null) { - isRPC = soapBindingInfo.getStyle().equals(WSDLConstants.RPC); + isRPC = WSDLConstants.RPC.equals(soapBindingInfo.getStyle()); } else if (xml != null) { xmlBindingInfo = xml; }