svn commit: r1003653 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java

[dkulp]

Author: dkulp
Date: Fri Oct  1 21:14:05 2010
New Revision: 1003653

URL: http://svn.apache.org/viewvc?rev=1003653&view=rev
Log:
Merged revisions 1003650 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1003650 | dkulp | 2010-10-01 17:10:39 -0400 (Fri, 01 Oct 2010) | 1 line
  
  The one arg constructor can sometimes end up with a Bus, not the impl
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java?rev=1003653&r1=1003652&r2=1003653&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
 Fri Oct  1 21:14:05 2010
@@ -163,9 +163,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);
         }