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 2012/09/07 14:14:29 UTC
svn commit: r1381990 -
/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
Author: gnodet
Date: Fri Sep 7 12:14:28 2012
New Revision: 1381990
URL: http://svn.apache.org/viewvc?rev=1381990&view=rev
Log:
[KARAF-1797] Fix NPE thrown from OsgiConfiguration.unregister
Modified:
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
Modified: karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java?rev=1381990&r1=1381989&r2=1381990&view=diff
==============================================================================
--- karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java (original)
+++ karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java Fri Sep 7 12:14:28 2012
@@ -16,12 +16,9 @@
*/
package org.apache.karaf.jaas.config.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
-
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
@@ -41,11 +38,15 @@ public class OsgiConfiguration extends C
}
public void register(JaasRealm realm, Map<String,?> properties) {
- realms.add(realm);
+ if (realm != null) {
+ realms.add(realm);
+ }
}
public void unregister(JaasRealm realm, Map<String,?> properties) {
- realms.remove(realm);
+ if (realm != null) {
+ realms.remove(realm);
+ }
}
public AppConfigurationEntry[] getAppConfigurationEntry(String name) {