[jboss-svn-commits] JBoss Common SVN: r4896 - in common-core/trunk: src/main/java/org/jboss/util/xml and 1 other directories.

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

Author: klape
Date: 2011-06-20 23:27:29 -0400 (Mon, 20 Jun 2011)
New Revision: 4896

Modified:
   common-core/trunk/
   common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java
   common-core/trunk/src/test/java/org/jboss/test/util/test/xml/resolver/JBossEntityResolverUnitTestCase.java
Log:
[JBCOMMON-120] Fix for false positives in JBossEntityResolver.resolveClassName()


Property changes on: common-core/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /common-core/branches/2.2.16.GA_JBPAPP-6542:4894

Modified: common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java	2011-06-07 21:40:11 UTC (rev 4895)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java	2011-06-21 03:27:29 UTC (rev 4896)
@@ -549,7 +549,7 @@
          else
             filename = path;
 
-         if(path.length() == 0)
+         if(filename.length() == 0)
             return null;
 
          if (trace)

Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/xml/resolver/JBossEntityResolverUnitTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/xml/resolver/JBossEntityResolverUnitTestCase.java	2011-06-07 21:40:11 UTC (rev 4895)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/xml/resolver/JBossEntityResolverUnitTestCase.java	2011-06-21 03:27:29 UTC (rev 4896)
@@ -97,6 +97,29 @@
       assertEquals(280, resolvedSize);
    }
 
+   public void testEmptyFilenameResolution()
+      throws Exception
+   {
+      String rootDir = "file:///";
+      URL rootUrl = new URL(rootDir);
+      JBossEntityResolver resolver = new JBossEntityResolver();
+      InputSource resolvedSource = resolver.resolveEntity(rootDir, rootDir);
+
+      InputStream resolverStream = resolvedSource.getByteStream();
+      InputStream rootDirStream = rootUrl.openStream();
+
+      int resolverByte,rootDirByte;
+      while((resolverByte = resolverStream.read()) != -1)
+      {
+         rootDirByte = rootDirStream.read();
+         if(rootDirByte != resolverByte)
+            assertTrue("Empty filename resolution failed. URL: " + rootUrl, false);
+      }
+
+      if(rootDirStream.read() != -1)
+         assertTrue("Empty filename resolution failed. URL: " + rootUrl, false);
+   }
+
    private int bytesTotal(InputStream redefinedStream) throws IOException
    {
       byte[] bytes = new byte[1024];