You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2009/06/12 12:48:53 UTC
svn commit: r784064 - in /cxf/branches/2.2.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
Author: ningjiang
Date: Fri Jun 12 10:48:53 2009
New Revision: 784064
URL: http://svn.apache.org/viewvc?rev=784064&view=rev
Log:
Merged revisions 784059 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r784059 | ningjiang | 2009-06-12 18:24:24 +0800 (Fri, 12 Jun 2009) | 1 line
CXF-2279 clean up the application context map of ConfigurerImpl when it is destroied
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java (props changed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 12 10:48:53 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396
+/cxf/trunk:782728-782730,783097,783294,783396,784059
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 12 10:48:53 2009
@@ -1 +1 @@
-/cxf/trunk:1-782619,782728-782730,783097,783294,783396
+/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059
Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java?rev=784064&r1=784063&r2=784064&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java (original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java Fri Jun 12 10:48:53 2009
@@ -217,12 +217,18 @@
addApplicationContext(ac);
setBeanFactory(ac.getAutowireCapableBeanFactory());
}
+
public final void addApplicationContext(ApplicationContext ac) {
if (!appContexts.contains(ac)) {
appContexts.add(ac);
initWildcardDefinitionMap();
}
}
+
+ public void destroy() {
+ super.destroy();
+ appContexts.clear();
+ }
public Class<?> getRegistrationType() {
return Configurer.class;
Propchange: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 12 10:48:53 2009
@@ -0,0 +1 @@
+/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java:784059