svn commit: r1541163 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security: ConfigurationParameters.java authentication/AbstractLoginModule.java

[angela]

Author: angela
Date: Tue Nov 12 17:09:14 2013
New Revision: 1541163

URL: http://svn.apache.org/r1541163
Log:
minor improvement

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java?rev=1541163&r1=1541162&r2=1541163&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
 Tue Nov 12 17:09:14 2013
@@ -93,7 +93,7 @@ public final class ConfigurationParamete
      */
     @Nonnull
     public static ConfigurationParameters of(@Nonnull Properties properties) {
-        if (properties == null || properties.isEmpty()) {
+        if (properties.isEmpty()) {
             return EMPTY;
         }
         Map<String, Object> options = new HashMap<String, 
Object>(properties.size());
@@ -110,7 +110,7 @@ public final class ConfigurationParamete
      */
     @Nonnull
     public static ConfigurationParameters of(@Nonnull Dictionary<String, 
Object> properties) {
-        if (properties == null || properties.isEmpty()) {
+        if (properties.isEmpty()) {
             return EMPTY;
         }
         Map<String, Object> options = new HashMap<String, 
Object>(properties.size());
@@ -128,7 +128,7 @@ public final class ConfigurationParamete
      */
     @Nonnull
     public static ConfigurationParameters of(@Nonnull Map<?, ?> map) {
-        if (map == null || map.isEmpty()) {
+        if (map.isEmpty()) {
             return EMPTY;
         }
         Map<String, Object> options = new HashMap<String, Object>(map.size());
@@ -166,8 +166,6 @@ public final class ConfigurationParamete
      *     match the type of the default value.</li>
      * </ul>
      *
-     * TODO: shouldn't a NULL configuration value be treated the same as 
missing one, in respect to the default value handling? I don't think it's 
intuitive that NULL is returned.
-     *
      * @param key The name of the configuration option.
      * @param defaultValue The default value to return if no such entry exists
      * or to use for conversion.
@@ -206,7 +204,8 @@ public final class ConfigurationParamete
         if (property == null) {
             return defaultValue;
         } else {
-            return convert(property, defaultValue, null);
+            T value = convert(property, defaultValue, null);
+            return (value == null) ? defaultValue : value;
         }
     }
 
@@ -246,7 +245,7 @@ public final class ConfigurationParamete
             }
         } catch (NumberFormatException e) {
             log.warn("Invalid value {}; cannot be parsed into {}", str, 
clazz.getName());
-            throw new IllegalArgumentException("Cannot convert config entry " 
+ str + " to " + clazz.getName());
+            throw new IllegalArgumentException("Cannot convert config entry " 
+ str + " to " + clazz.getName(), e);
         }
     }
     
//-----------------------------------------------------------------------------------<
 Map interface delegation >---

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java?rev=1541163&r1=1541162&r2=1541163&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
 Tue Nov 12 17:09:14 2013
@@ -171,7 +171,7 @@ public abstract class AbstractLoginModul
         this.subject = subject;
         this.callbackHandler = callbackHandler;
         this.sharedState = sharedState;
-        this.options = ConfigurationParameters.of(options);
+        this.options = (options == null) ? ConfigurationParameters.EMPTY : 
ConfigurationParameters.of(options);
     }
 
     @Override