Changeset 5481 for CMDIValidator

Timestamp:

07/21/14 14:56:52 (10 years ago)

Author:

Oliver Schonefeld

Message:

• avoid NullPointerException? in evil Xerces hack

Location:

CMDIValidator/trunk/cmdi-validator-core

Files:

• lib/xerces/xercesImpl-patched/2.11.0/xercesImpl-patched-2.11.0.jar (modified) (previous)
• lib/xerces/xercesImpl-patched/2.11.0/xercesImpl-patched-2.11.0.jar.md5 (modified) (1 diff)
• lib/xerces/xercesImpl-patched/2.11.0/xercesImpl-patched-2.11.0.jar.sha1 (modified) (1 diff)
• lib/xerces/xercesImpl-patched/maven-metadata-local.xml (modified) (1 diff)
• lib/xerces/xercesImpl-patched/maven-metadata-local.xml.md5 (modified) (1 diff)
• lib/xerces/xercesImpl-patched/maven-metadata-local.xml.sha1 (modified) (1 diff)
• xerces.patch (modified) (2 diffs)

CMDIValidator/trunk/cmdi-validator-core/lib/xerces/xercesImpl-patched/2.11.0/xercesImpl-patched-2.11.0.jar.md5

@@ -1 @@
-b7254ab06d249d7de96cd581e7c3e6fb
+32c37968616e7249cf8eed6cb7f72f72

CMDIValidator/trunk/cmdi-validator-core/lib/xerces/xercesImpl-patched/2.11.0/xercesImpl-patched-2.11.0.jar.sha1

@@ -1 @@
-528ddde0273c406cff6b95210b5729e9aa9694a2
+b573255726a966cd32a34b2effc661ca41c270fe

CMDIValidator/trunk/cmdi-validator-core/lib/xerces/xercesImpl-patched/maven-metadata-local.xml

@@ -8 +8 @@
       <version>2.11.0</version>
     </versions>
-    <lastUpdated>20140407180824</lastUpdated>
+    <lastUpdated>20140721145218</lastUpdated>
   </versioning>
 </metadata>

CMDIValidator/trunk/cmdi-validator-core/lib/xerces/xercesImpl-patched/maven-metadata-local.xml.md5

@@ -1 @@
-d2bbebbf1b1241e28dcb5bda620494f1
+a8d029b5b6abf46af6909db6db97e367

CMDIValidator/trunk/cmdi-validator-core/lib/xerces/xercesImpl-patched/maven-metadata-local.xml.sha1

@@ -1 @@
-69484c27d7b2c8a5e6f2545ed79e7b61586cfc7f
+52cf68cd66a895152f364269d60e395f9a68a551

CMDIValidator/trunk/cmdi-validator-core/xerces.patch

@@ -3 +3 @@
 --- src/org/apache/xerces/impl/xs/XMLSchemaValidator.java   (revision 1584342)
 +++ src/org/apache/xerces/impl/xs/XMLSchemaValidator.java   (working copy)
-@@ -1345,8 +1345,11 @@
+@@ -1345,8 +1345,17 @@
  
          fIdConstraint = false;
          //reset XSDDescription
-+        fXSDDescription.reset();
++        if (fXSDDescription != null) {
++            fXSDDescription.reset();
++        }
          fLocationPairs.clear();
          fExpandedLocationPairs.clear();
-+        fUnparsedLocations.clear();
-+        fGrammarBucket.reset();
++        if (fUnparsedLocations != null) {
++            fUnparsedLocations.clear();
++        }
++        if (fGrammarBucket != null) {
++            fGrammarBucket.reset();
++        }
  
          // cleanup id table
          fValidationState.resetIDTables();
-@@ -2693,6 +2696,16 @@
+@@ -2693,6 +2702,19 @@
                  }
              }
  
 +            /*
-+             * XXX: evil hack to revisit grammar pool with location information
++             * BEGIN EVIL HACK: revisit grammar pool with location informtion
 +             */
-+            if (grammar == null) {
++            if ((grammar == null) && (fGrammarPool != null)) {
 +                grammar = (SchemaGrammar) fGrammarPool.retrieveGrammar(fXSDDescription);
 +                if (grammar != null) {
@@ -28 +34 @@
 +                }
 +            }
++            /*
++             * END EVIL HACK
++             */
 +
              if (grammar == null || fXSDDescription.fLocationHints != null) {