You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rd...@apache.org on 2006/04/22 13:38:28 UTC
svn commit: r396112 -
/jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/PathableClassLoader.java
Author: rdonkin
Date: Sat Apr 22 04:38:25 2006
New Revision: 396112
URL: http://svn.apache.org/viewcvs?rev=396112&view=rev
Log:
Replaced method introduced in JDK1.4 with clean implementation.
Modified:
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/PathableClassLoader.java
Modified: jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/PathableClassLoader.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/PathableClassLoader.java?rev=396112&r1=396111&r2=396112&view=diff
==============================================================================
--- jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/PathableClassLoader.java (original)
+++ jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/PathableClassLoader.java Sat Apr 22 04:38:25 2006
@@ -270,11 +270,30 @@
}
Enumeration parentUrls = parent.getResources(name);
- ArrayList localItems = Collections.list(localUrls);
- ArrayList parentItems = Collections.list(parentUrls);
+ ArrayList localItems = toList(localUrls);
+ ArrayList parentItems = toList(parentUrls);
localItems.addAll(parentItems);
return Collections.enumeration(localItems);
}
+ }
+
+ /**
+ *
+ * Clean implementation of list function of
+ * {@link java.utils.Collection} added in JDK 1.4
+ * @param en <code>Enumeration</code>, possibly null
+ * @return <code>ArrayList</code> containing the enumerated
+ * elements in the enumerated order, not null
+ */
+ private ArrayList toList(Enumeration en) {
+ ArrayList results = new ArrayList();
+ if (en != null) {
+ while (en.hasMoreElements()){
+ Object element = en.nextElement();
+ results.add(element);
+ }
+ }
+ return results;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org