JBossEntityResolver and xsd:redefine resolution

[aloubyansky]

The issue was discovered in http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4136295#4136295

The problem is that when the schema that contains xsd:redefine is parsed and when the redefine is resolved, the arguments passed to the JBossEntityResolver.resolve(publicId, systemId) are:
- publicId is the namespace of the schema that contains xsd:redefine
- systemId is the schemaLocation attribute of the xsd:redefine

In some cases (i.e. if the namespace of the redefining schema is mapped to its schema location in the JBossEntityResolver and both schemas are in the classpath) this results in StackOverflowError since the JBossEntityResolver is looking at the publicId first during resolveEntity.

I want to change this to check if the publicId is registered and if the registered schemaLocation is different from the systemId argument then try resolving the systemId argument first.

[aloubyansky]

A testcase in the xb that reproduces the issue is jbossxb/trunk/src/test/java/org/jboss/test/xb/schemaresolver/test/DefaultSchemaResolverUnitTestCase.java

[aloubyansky]

The issue for this http://jira.jboss.com/jira/browse/JBCOMMON-43

I've committed the fix and the the testcase to common-core org.jboss.test.util.test.xml.resolver.JBossEntityResolverUnitTestCase.

Possible backwards incompatibility in behavior is that schema location registered locally is different from the one in the XML's schemaLocation with the purpose of override. In this case, the schemaLocation from the XML file will be used. And at the moment w/o falling back to the registered one if the one in the XML occured to be invalid.

[kabirkhan]

I've commited a small fix to this, resolveEntitiy() did not check that the localEntities != null before trying to read from it

[kabirkhan]

Actually, I don't seem to be able to commit there?

Error: Commit failed (details follow):
Error: MKACTIVITY of '/repos/common/!svn/act/53551a94-a2fe-ee45-b2ab-213af84ca041': 403 Forbidden (https://svn.jboss.org)

Can you please apply the following patch

Index: C:/cygwin/home/Kabir/sourcecontrol/common-trunks/common-core/src/main/java/org/jboss/util/xml/JBossEntityResolver.java
===================================================================
--- C:/cygwin/home/Kabir/sourcecontrol/common-trunks/common-core/src/main/java/org/jboss/util/xml/JBossEntityResolver.java (revision 2744)
+++ C:/cygwin/home/Kabir/sourcecontrol/common-trunks/common-core/src/main/java/org/jboss/util/xml/JBossEntityResolver.java (working copy)
@@ -258,7 +258,9 @@
 boolean resolvePublicIdFirst = true;
 if(publicId != null && systemId != null)
 {
- String registeredSystemId = (String) localEntities.get(publicId);
+ String registeredSystemId = null;
+ if (localEntities != null)
+ registeredSystemId = (String) localEntities.get(publicId);
 if(registeredSystemId == null)
 registeredSystemId = (String) entities.get(publicId);

[aloubyansky]

Sure, done. Also deployed.

mvn wrote:
Uploading: https://snapshots.jboss.org/maven2/org/jboss/jboss-common-core/2.2.4-SNAPSHOT/jboss-common-core-2.2.4-2008031
8.140658-1.jar
...
Uploading: https://snapshots.jboss.org/maven2/org/jboss/jboss-common-core/2.2.4-SNAPSHOT/jboss-common-core-2.2.4-2008031
8.140658-1-sources.jar

[anil.saldhana]

http://www.jboss.com/index.html?module=bb&op=viewtopic&t=131725

Is this new behavior related? What is the solution for this?