Author: dkulp
Date: Wed Oct 17 13:37:06 2007
New Revision: 585678
URL: http://svn.apache.org/viewvc?rev=585678&view=rev
Log:
Merged revisions 585560 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r585560 | dkulp | 2007-10-17 12:29:49 -0400 (Wed, 17 Oct 2007) | 2 lines
Fix SpringBusFactory not actually detecting if a Bus is already defined in
the context
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java?rev=585678&r1=585677&r2=585678&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
Wed Oct 17 13:37:06 2007
@@ -41,12 +41,16 @@
}
public Object postProcessBeforeInitialization(Object bean, String beanId)
throws BeansException {
- injector.construct(bean);
+ if (bean != null) {
+ injector.construct(bean);
+ }
return bean;
}
public void postProcessBeforeDestruction(Object bean, String beanId) {
- injector.destroy(bean);
+ if (bean != null) {
+ injector.destroy(bean);
+ }
}
}
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java?rev=585678&r1=585677&r2=585678&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
Wed Oct 17 13:37:06 2007
@@ -56,11 +56,9 @@
private boolean defaultBusNotExists() {
if (null != context) {
- context.containsBean(Bus.DEFAULT_BUS_ID);
- return false;
- } else {
- return true;
+ return !context.containsBean(Bus.DEFAULT_BUS_ID);
}
+ return true;
}
public Bus createBus(String cfgFile) {
