You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/12/22 15:19:52 UTC
svn commit: r1051911 -
/karaf/branches/karaf-2.1.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
Author: gnodet
Date: Wed Dec 22 14:19:52 2010
New Revision: 1051911
URL: http://svn.apache.org/viewvc?rev=1051911&view=rev
Log:
[KARAF-330] Revert bad fix, as the problem is actually in blueprint
Modified:
karaf/branches/karaf-2.1.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
Modified: karaf/branches/karaf-2.1.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java?rev=1051911&r1=1051910&r2=1051911&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java (original)
+++ karaf/branches/karaf-2.1.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java Wed Dec 22 14:19:52 2010
@@ -29,30 +29,26 @@ import org.apache.karaf.jaas.config.Jaas
public class OsgiConfiguration extends Configuration {
- private final List<JaasRealm> realms = new ArrayList<JaasRealm>();
+ private final List<JaasRealm> realms = new CopyOnWriteArrayList<JaasRealm>();
- public synchronized void init() {
+ public void init() {
Configuration.setConfiguration(this);
}
- public synchronized void close() {
+ public void close() {
realms.clear();
Configuration.setConfiguration(null);
}
- public synchronized void register(JaasRealm realm, Map<String,?> properties) {
+ public void register(JaasRealm realm, Map<String,?> properties) {
realms.add(realm);
}
- public synchronized void unregister(JaasRealm realm, Map<String,?> properties) {
- for (Iterator<JaasRealm> it = realms.iterator(); it.hasNext();) {
- if (it.next() == realm) {
- it.remove();
- }
- }
+ public void unregister(JaasRealm realm, Map<String,?> properties) {
+ realms.remove(realm);
}
- public synchronized AppConfigurationEntry[] getAppConfigurationEntry(String name) {
+ public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
JaasRealm realm = null;
for (JaasRealm r : realms) {
if (r.getName().equals(name)) {
@@ -67,7 +63,7 @@ public class OsgiConfiguration extends C
return null;
}
- public synchronized void refresh() {
+ public void refresh() {
// Nothing to do, as we auto-update the configuration
}
}