svn commit: r1370133 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java

[rmannibucau]

Author: rmannibucau
Date: Tue Aug  7 07:59:59 2012
New Revision: 1370133

URL: http://svn.apache.org/viewvc?rev=1370133&view=rev
Log:
TOMEE-350 TempClassLoader FORCE_SKIP and FORCE_LOAD should be list and not 
string

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java?rev=1370133&r1=1370132&r2=1370133&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
 Tue Aug  7 07:59:59 2012
@@ -29,6 +29,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Set;
 
 /**
@@ -51,8 +53,16 @@ public class TempClassLoader extends URL
     private static final boolean SKIP_COMMONS_NET = 
skipLib("org.apache.commons.net.pop3.POP3Client");
 
     // - will not match anything, that's the desired default behavior
-    private static final String FORCED_SKIP = 
SystemInstance.get().getOptions().get("openejb.classloader.forced-skip", "-");
-    private static final String FORCED_LOAD = 
SystemInstance.get().getOptions().get("openejb.classloader.forced-load", "-");
+    private static final Collection<String> FORCED_SKIP = 
list("openejb.classloader.forced-skip");
+    private static final Collection<String> FORCED_LOAD = 
list("openejb.classloader.forced-load");
+
+    private static Collection<String> list(final String key) {
+        final String s = SystemInstance.get().getOptions().get(key, (String) 
null);
+        if (s == null || s.trim().isEmpty()) {
+            return null; // no need to iterate over something empty
+        }
+        return Arrays.asList(s.trim().split(","));
+    }
 
     private static boolean skipLib(final String includedClass) {
         try {
@@ -169,11 +179,19 @@ public class TempClassLoader extends URL
         if (skip.contains(Skip.ALL)) {
             return true;
         }
-        if (name.startsWith(FORCED_SKIP)) {
-            return true;
+        if (FORCED_SKIP != null) {
+            for (String prefix : FORCED_SKIP) {
+                if (name.startsWith(prefix)) {
+                    return true;
+                }
+            }
         }
-        if (name.startsWith(FORCED_LOAD)) {
-            return false;
+        if (FORCED_LOAD != null) {
+            for (String prefix : FORCED_LOAD) {
+                if (name.startsWith(prefix)) {
+                    return false;
+                }
+            }
         }
 
         if (name.startsWith("java.")) return true;