svn commit: r735665 - /incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java

[fmeschbe]

Author: fmeschbe
Date: Mon Jan 19 03:35:50 2009
New Revision: 735665

URL: http://svn.apache.org/viewvc?rev=735665&view=rev
Log:
SLING-833 Accept Collection values and do not require Vector values

Modified:
    
incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java

Modified: 
incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java?rev=735665&r1=735664&r2=735665&view=diff
==============================================================================
--- 
incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java
 (original)
+++ 
incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java
 Mon Jan 19 03:35:50 2009
@@ -21,13 +21,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.ref.SoftReference;
+import java.util.Collection;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.Vector;
 
 import org.apache.sling.commons.log.LogManager;
 import org.osgi.service.cm.ConfigurationException;
@@ -356,7 +356,7 @@
      * names form a hierarchy like Java packages, the listed names also apply 
to
      * "child names" unless more specific configuration applies for such
      * children. This property may be a single string, an array of strings or a
-     * vector of strings. Each string may itself be a comma-separated list of
+     * collection of strings. Each string may itself be a comma-separated list 
of
      * logger names. If this property is missing a
      * <code>ConfigurationException</code> is thrown.</dd>
      * <dt>{...@link LogManager#LOG_FILE}</dt>
@@ -566,7 +566,7 @@
     /**
      * Decomposes the <code>loggers</code> configuration object into a set of
      * logger names. The <code>loggers</code> object may be a single string,
-     * an array of strings or a vector of strings. Each string may in turn be a
+     * an array of strings or a collection of strings. Each string may in turn 
be a
      * comma-separated list of strings. Each entry makes up an entry in the
      * resulting set.
      * 
@@ -598,8 +598,8 @@
         Object[] loggersArray;
         if (loggers.getClass().isArray()) {
             loggersArray = (Object[]) loggers;
-        } else if (loggers instanceof Vector) {
-            loggersArray = ((Vector<?>) loggers).toArray();
+        } else if (loggers instanceof Collection) {
+            loggersArray = ((Collection<?>) loggers).toArray();
         } else {
             loggersArray = new Object[] { loggers };
         }