svn commit: r1385294 - /karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java

[iocanel]

Author: iocanel
Date: Sun Sep 16 16:05:07 2012
New Revision: 1385294

URL: http://svn.apache.org/viewvc?rev=1385294&view=rev
Log:
[KARAF-1835] Fix npe in jaas:realm-manage command.

Modified:
    
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java

Modified: 
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java?rev=1385294&r1=1385293&r2=1385294&view=diff
==============================================================================
--- 
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
 (original)
+++ 
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
 Sun Sep 16 16:05:07 2012
@@ -88,7 +88,6 @@ public abstract class JaasCommandSupport
 
         AppConfigurationEntry appConfigurationEntry = null;
         if (realm != null) {
-
             AppConfigurationEntry[] entries = realm.getEntries();
 
             // if no moduleName provided and a there is a single module in the 
realm.
@@ -98,7 +97,7 @@ public abstract class JaasCommandSupport
 
             for (AppConfigurationEntry entry : entries) {
                 String moduleClass = (String) 
entry.getOptions().get(ProxyLoginModule.PROPERTY_MODULE);
-                if (moduleName.equals(entry.getLoginModuleName()) || 
moduleName.equals(moduleClass)) {
+                if (moduleName != null && 
(moduleName.equals(entry.getLoginModuleName()) || 
moduleName.equals(moduleClass))) {
                     return entry;
                 }
             }