You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/07/11 08:31:40 UTC
svn commit: r1360032 - in /cxf/branches/2.4.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Author: ffang
Date: Wed Jul 11 06:31:39 2012
New Revision: 1360032
URL: http://svn.apache.org/viewvc?rev=1360032&view=rev
Log:
Merged revisions 1360022 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1360022 | ffang | 2012-07-11 14:21:27 +0800 (三, 11 7 2012) | 16 lines
Merged revisions 1360015 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................
r1360015 | ffang | 2012-07-11 13:52:46 +0800 (三, 11 7 2012) | 9 lines
Merged revisions 1360007 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1360007 | ffang | 2012-07-11 12:32:12 +0800 (三, 11 7 2012) | 1 line
[CXF-4411]Maven plugin fails wsdl2java execution with concurrent modification exception
........
................
................
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1360032&r1=1360031&r2=1360032&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java Wed Jul 11 06:31:39 2012
@@ -90,7 +90,7 @@ public class ExtensionManagerImpl implem
load(resources);
}
- public final void load(String resources[]) {
+ public final synchronized void load(String resources[]) {
if (resources == null) {
return;
}
@@ -108,7 +108,7 @@ public class ExtensionManagerImpl implem
}
}
}
- public void add(Extension ex) {
+ public synchronized void add(Extension ex) {
all.put(ex.getName(), ex);
}
@@ -146,7 +146,7 @@ public class ExtensionManagerImpl implem
}
load(resource, loader);
}
- final void load(String resource, ClassLoader l) throws IOException {
+ final synchronized void load(String resource, ClassLoader l) throws IOException {
Enumeration<URL> urls = l.getResources(resource);
@@ -305,7 +305,7 @@ public class ExtensionManagerImpl implem
return ex != null && ex.getNamespaces() != null
&& ex.getNamespaces().contains(value);
}
- public void destroyBeans() {
+ public synchronized void destroyBeans() {
for (Extension ex : all.values()) {
if (ex.getLoadedObject() != null) {
ResourceInjector injector = new ResourceInjector(resourceManager);