Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 29233 invoked from network); 12 May 2008 19:25:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 May 2008 19:25:22 -0000 Received: (qmail 23089 invoked by uid 500); 12 May 2008 19:25:24 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 23039 invoked by uid 500); 12 May 2008 19:25:24 -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 23028 invoked by uid 99); 12 May 2008 19:25:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 May 2008 12:25:24 -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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 May 2008 19:24:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 837D62388A09; Mon, 12 May 2008 12:24:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r655612 - in /cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/service/model/BindingInfo.java rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java Date: Mon, 12 May 2008 19:24:59 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080512192459.837D62388A09@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon May 12 12:24:59 2008 New Revision: 655612 URL: http://svn.apache.org/viewvc?rev=655612&view=rev Log: Merged revisions 655602 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r655602 | dkulp | 2008-05-12 15:06:32 -0400 (Mon, 12 May 2008) | 2 lines Fix more issues with wsdl first problems where binding operations have message names, but the portTypes don't (and thus should use defaults) ........ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java?rev=655612&r1=655611&r2=655612&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java (original) +++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java Mon May 12 12:24:59 2008 @@ -64,19 +64,22 @@ return name; } - private boolean nameEquals(String a, String b) { + private boolean nameEquals(String a, String b, String def) { if (a == null) { // in case of input/output itself is empty return true; } else { + if (b == null) { + b = def; + } return "".equals(a) ? "".equals(b) : a.equals(b); } } public BindingOperationInfo buildOperation(QName opName, String inName, String outName) { for (OperationInfo op : getInterface().getOperations()) { if (opName.equals(op.getName()) - && nameEquals(inName, op.getInputName()) - && nameEquals(outName, op.getOutputName())) { + && nameEquals(inName, op.getInputName(), op.getName().getLocalPart() + "Request") + && nameEquals(outName, op.getOutputName(), op.getName().getLocalPart() + "Response")) { return new BindingOperationInfo(this, op); } Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java?rev=655612&r1=655611&r2=655612&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java Mon May 12 12:24:59 2008 @@ -19,7 +19,6 @@ package org.apache.cxf.frontend; import java.lang.reflect.Method; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -46,7 +45,8 @@ for (Method m : methods) { methodToOp.put(m, o); - Map biToBop = new HashMap(); + Map biToBop + = new ConcurrentHashMap(); infoMap.put(m, biToBop); }