[jboss-svn-commits] JBoss Common SVN: r2630 - jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling.

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

Author: scott.stark at jboss.org
Date: 2007-10-10 18:55:46 -0400 (Wed, 10 Oct 2007)
New Revision: 2630

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
Log:
Correct how the system dtd is passed to the resolver

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2007-10-10 22:31:08 UTC (rev 2629)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2007-10-10 22:55:46 UTC (rev 2630)
@@ -292,11 +292,11 @@
          {
             String schemaLocation = atts == null ? null : Util.getSchemaLocation(atts, namespaceURI);
             // Use the dtd info if it exists and there is no schemaLocation
-            if(sawDTD && schemaLocation != null && schemaLocation.length() == 0)
+            if(sawDTD && schemaLocation == null || schemaLocation.length() == 0)
             {
                schemaLocation = dtdSystemId;
             }
-            schemaBinding = schemaResolver.resolve(namespaceURI, dtdPublicId, schemaLocation);
+            schemaBinding = schemaResolver.resolve(namespaceURI, null, schemaLocation);
             if(schemaBinding != null)
             {
                particle = schemaBinding.getElementParticle(startName);