[jboss-cvs] JBossAS SVN: r99366 - in projects/jboss-cl/branches/vfs3-int/classloading-vfs/src: test/java/org/jboss/test/classloading/vfs/metadata/xml and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: johnbailey
Date: 2010-01-13 16:35:08 -0500 (Wed, 13 Jan 2010)
New Revision: 99366

Modified:
   projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java
   projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/JBossXBTestDelegate.java
Log:
[JBAS-7360] - Another VFS3 integration fix

Modified: projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java
===================================================================
--- projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java	2010-01-13 21:34:25 UTC (rev 99365)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java	2010-01-13 21:35:08 UTC (rev 99366)
@@ -524,7 +524,7 @@
          try
          {
             VirtualFile child = root.getChild(name);
-            if (child != null)
+            if (child.exists())
                urls.add(child.toURL());
          }
          catch (Exception e)

Modified: projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/JBossXBTestDelegate.java
===================================================================
--- projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/JBossXBTestDelegate.java	2010-01-13 21:34:25 UTC (rev 99365)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/JBossXBTestDelegate.java	2010-01-13 21:35:08 UTC (rev 99366)
@@ -42,9 +42,6 @@
  */
 public class JBossXBTestDelegate extends AbstractTestDelegate
 {
-   /** Whether initialization has been done */
-   private static boolean done = false;
-
    /** The unmarshaller factory */
    protected UnmarshallerFactory unmarshallerFactory;
 
@@ -52,24 +49,6 @@
    protected SchemaBindingResolver defaultResolver;
 
    /**
-    * Initialize
-    */
-   public synchronized static void init()
-   {
-      if (done)
-         return;
-      done = true;
-      URL.setURLStreamHandlerFactory(new URLStreamHandlerFactory());
-      URLStreamHandlerFactory.preload();
-      String handlerPkgs = System.getProperty("java.protocol.handler.pkgs");
-      if (handlerPkgs != null)
-         handlerPkgs += "|org.jboss.net.protocol";
-      else
-         handlerPkgs = "org.jboss.net.protocol";
-      System.setProperty("java.protocol.handler.pkgs", handlerPkgs);
-   }
-
-   /**
     * Create a new JBossXBTestDelegate.
     *
     * @param clazz the test class
@@ -83,7 +62,6 @@
    public void setUp() throws Exception
    {
       super.setUp();
-      init();
       unmarshallerFactory = UnmarshallerFactory.newInstance();
       initResolver();
    }