Author: dkulp
Date: Tue Nov 30 16:47:59 2010
New Revision: 1040638
URL: http://svn.apache.org/viewvc?rev=1040638&view=rev
Log:
Merged revisions 1040634 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1040634 | dkulp | 2010-11-30 11:45:26 -0500 (Tue, 30 Nov 2010) | 1 line
[CXF-3136] Make sure the ResourceManager is fully configured
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java?rev=1040638&r1=1040637&r2=1040638&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
Tue Nov 30 16:47:59 2010
@@ -86,6 +86,10 @@ public class Jsr250BeanPostProcessor
}
public Object postProcessAfterInitialization(Object bean, String beanId)
throws BeansException {
if (!isProcessing) {
+ if (resourceManager == null && bean instanceof ResourceManager) {
+ resourceManager = (ResourceManager)bean;
+ resourceManager.addResourceResolver(new
BusApplicationContextResourceResolver(context));
+ }
return bean;
}
if (bean != null
