svn commit: r648135 - in /commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2: AbstractHierarchicalConfiguration.java JNDIConfiguration.java

[ebourg]

Author: ebourg
Date: Tue Apr 15 00:16:34 2008
New Revision: 648135

URL: http://svn.apache.org/viewvc?rev=648135&view=rev
Log:
Changed the JNDI NodeHandler to return an empty list for the attributes

Modified:
    
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
    
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java

Modified: 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java?rev=648135&r1=648134&r2=648135&view=diff
==============================================================================
--- 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
 (original)
+++ 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
 Tue Apr 15 00:16:34 2008
@@ -877,12 +877,9 @@
         public void appendAttributes(T node, String parentKey, NodeHandler<T> 
handler)
         {
             List<String> attributes = handler.getAttributes(node);
-            if (attributes != null)
+            for (String attr : attributes)
             {
-                for (String attr : attributes)
-                {
-                    keyList.add(getExpressionEngine().attributeKey(node, 
parentKey, attr, handler));
-                }
+                keyList.add(getExpressionEngine().attributeKey(node, 
parentKey, attr, handler));
             }
         }
     }

Modified: 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java?rev=648135&r1=648134&r2=648135&view=diff
==============================================================================
--- 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
 (original)
+++ 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
 Tue Apr 15 00:16:34 2008
@@ -18,6 +18,7 @@
 package org.apache.commons.configuration2;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
 import javax.naming.Context;
@@ -388,7 +389,7 @@
 
         public List<String> getAttributes(JNDINode node)
         {
-            return null;
+            return Collections.emptyList();
         }
 
         public Object getAttributeValue(JNDINode node, String name)