Author: ffang
Date: Tue Dec 21 11:07:02 2010
New Revision: 1051447
URL: http://svn.apache.org/viewvc?rev=1051447&view=rev
Log:
Merged revisions 1051430 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1051430 | ffang | 2010-12-21 17:40:05 +0800 (二, 21 12 2010) | 1 line
[CXF-3206]PolicyEngineImpl initializes bus interceptors twice
........
Added:
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
- copied unchanged from r1051430,
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/org/
- copied from r1051430, cxf/trunk/rt/ws/policy/src/test/resources/org/
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/org/apache/
- copied from r1051430,
cxf/trunk/rt/ws/policy/src/test/resources/org/apache/
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/org/apache/cxf/
- copied from r1051430,
cxf/trunk/rt/ws/policy/src/test/resources/org/apache/cxf/
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/org/apache/cxf/ws/
- copied from r1051430,
cxf/trunk/rt/ws/policy/src/test/resources/org/apache/cxf/ws/
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/
- copied from r1051430,
cxf/trunk/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/PolicyEngineImplInitTest-context.xml
- copied unchanged from r1051430,
cxf/trunk/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/PolicyEngineImplInitTest-context.xml
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/ws/policy/pom.xml
cxf/branches/2.3.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/pom.xml?rev=1051447&r1=1051446&r2=1051447&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/policy/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/ws/policy/pom.xml Tue Dec 21 11:07:02 2010
@@ -38,6 +38,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<scope>provided</scope>
</dependency>
Modified:
cxf/branches/2.3.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java?rev=1051447&r1=1051446&r2=1051447&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
Tue Dec 21 11:07:02 2010
@@ -95,6 +95,10 @@ public class PolicyEngineImpl implements
@Resource
public final void setBus(Bus b) {
+ if (this.bus == b) {
+ //avoid bus init twice through injection
+ return;
+ }
bus = b;
addBusInterceptors();
FactoryBeanListenerManager fblm =
bus.getExtension(FactoryBeanListenerManager.class);
