cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1024007 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/jaxws22/spring/JAXWS22SpringEndpointImpl.java
Date Mon, 18 Oct 2010 21:18:14 GMT
Author: dkulp
Date: Mon Oct 18 21:18:13 2010
New Revision: 1024007

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

........
  r1024006 | dkulp | 2010-10-18 17:16:45 -0400 (Mon, 18 Oct 2010) | 1 line
  
  Fix failing tests on java5
........

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

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1024006

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 18 21:18:13 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023804,1023971-1023973
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023804,1023971-1023973,1024006

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/jaxws22/spring/JAXWS22SpringEndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/jaxws22/spring/JAXWS22SpringEndpointImpl.java?rev=1024007&r1=1024006&r2=1024007&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/jaxws22/spring/JAXWS22SpringEndpointImpl.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/jaxws22/spring/JAXWS22SpringEndpointImpl.java
Mon Oct 18 21:18:13 2010
@@ -30,14 +30,15 @@ import org.springframework.context.Appli
 public class JAXWS22SpringEndpointImpl extends org.apache.cxf.jaxws22.EndpointImpl
     implements ApplicationContextAware {
 
-    public JAXWS22SpringEndpointImpl(Object implementor) {
-        super((Bus)null, implementor);
+    public JAXWS22SpringEndpointImpl(Object o) {
+        super(o instanceof Bus ? (Bus)o : null,
+              o instanceof Bus ? null : o);
     }
+
     public JAXWS22SpringEndpointImpl(Bus bus, Object implementor) {
         super(bus, implementor);
     }
     
-    
     public void setApplicationContext(ApplicationContext ctx) throws BeansException {
         if (getBus() == null) {
             Bus bus = BusFactory.getThreadDefaultBus();



Mime
View raw message