You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by ch...@apache.org on 2017/02/10 19:02:15 UTC

svn commit: r1782503 - /felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java

Author: chetanm
Date: Fri Feb 10 19:02:15 2017
New Revision: 1782503

URL: http://svn.apache.org/viewvc?rev=1782503&view=rev
Log:
FELIX-5537 - ConfigSpiOsgi should not try to unregister provider if not registered

Modified:
    felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java

Modified: felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java
URL: http://svn.apache.org/viewvc/felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java?rev=1782503&r1=1782502&r2=1782503&view=diff
==============================================================================
--- felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java (original)
+++ felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java Fri Feb 10 19:02:15 2017
@@ -362,9 +362,12 @@ public class ConfigSpiOsgi extends Confi
 
     private void deregisterProvider(String providerName)
     {
-        Security.removeProvider(providerName);
-        log.log(LogService.LOG_INFO, "Removed provider " + providerName + " type "
-            + JAAS_CONFIG_ALGO_NAME + " from Security providers list");
+        if (providerName != null)
+        {
+            Security.removeProvider(providerName);
+            log.log(LogService.LOG_INFO, "Removed provider " + providerName + " type "
+                    + JAAS_CONFIG_ALGO_NAME + " from Security providers list");
+        }
     }
 
     // ---------- ServiceTracker ----------------------------------------------