You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/05/04 14:02:47 UTC
svn commit: r1333891 - in
/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring:
JAXRSClientFactoryBeanDefinitionParser.java
JAXRSServerFactoryBeanDefinitionParser.java
Author: sergeyb
Date: Fri May 4 12:02:46 2012
New Revision: 1333891
URL: http://svn.apache.org/viewvc?rev=1333891&view=rev
Log:
[CXF-4238] Fixing the failing tests on 2.3.x
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java?rev=1333891&r1=1333890&r2=1333891&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java Fri May 4 12:02:46 2012
@@ -106,7 +106,7 @@ public class JAXRSClientFactoryBeanDefin
}
public void setApplicationContext(ApplicationContext ctx) throws BeansException {
- if (getBus() == null) {
+ if (bus == null) {
Bus bus = BusFactory.getThreadDefaultBus();
BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
setBus(bus);
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java?rev=1333891&r1=1333890&r2=1333891&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java Fri May 4 12:02:46 2012
@@ -164,7 +164,7 @@ public class JAXRSServerFactoryBeanDefin
tempFactories.clear();
super.setResourceProviders(factories);
}
- if (getBus() == null) {
+ if (bus == null) {
Bus bus = BusFactory.getThreadDefaultBus();
BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
setBus(bus);