Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 25320 invoked from network); 1 Oct 2010 21:11:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Oct 2010 21:11:04 -0000 Received: (qmail 89190 invoked by uid 500); 1 Oct 2010 21:11:03 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 89097 invoked by uid 500); 1 Oct 2010 21:11:03 -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 89089 invoked by uid 99); 1 Oct 2010 21:11:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Oct 2010 21:11:03 +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; Fri, 01 Oct 2010 21:11:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 13FA823889ED; Fri, 1 Oct 2010 21:10:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1003650 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java Date: Fri, 01 Oct 2010 21:10:40 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101001211040.13FA823889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Oct 1 21:10:39 2010 New Revision: 1003650 URL: http://svn.apache.org/viewvc?rev=1003650&view=rev Log: The one arg constructor can sometimes end up with a Bus, not the impl Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java?rev=1003650&r1=1003649&r2=1003650&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java Fri Oct 1 21:10:39 2010 @@ -180,9 +180,11 @@ public class EndpointDefinitionParser ex public static class SpringEndpointImpl extends EndpointImpl implements ApplicationContextAware { - public SpringEndpointImpl(Object implementor) { - super((Bus)null, implementor); + public SpringEndpointImpl(Object o) { + super(o instanceof Bus ? (Bus)o : null, + o instanceof Bus ? null : o); } + public SpringEndpointImpl(Bus bus, Object implementor) { super(bus, implementor); }