src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java

*** 1,8 ****
  /*
   * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
!  * @LastModified: Oct 2017
   */
  /*
   * Licensed to the Apache Software Foundation (ASF) under one or more
   * contributor license agreements.  See the NOTICE file distributed with
   * this work for additional information regarding copyright ownership.
--- 1,8 ----
  /*
   * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
!  * @LastModified: Nov 2017
   */
  /*
   * Licensed to the Apache Software Foundation (ASF) under one or more
   * contributor license agreements.  See the NOTICE file distributed with
   * this work for additional information regarding copyright ownership.
*** 50,60 ****
       * @return SchemaGrammar associated with the namespace
       */
      public SchemaGrammar getGrammar(String namespace) {
          if (namespace == null)
              return fNoNSGrammar;
!         return (SchemaGrammar)fGrammarRegistry.get(namespace);
      }
  
      /**
       * Put a schema grammar into the registry
       * This method is for internal use only: it assumes that a grammar with
--- 50,60 ----
       * @return SchemaGrammar associated with the namespace
       */
      public SchemaGrammar getGrammar(String namespace) {
          if (namespace == null)
              return fNoNSGrammar;
!         return fGrammarRegistry.get(namespace);
      }
  
      /**
       * Put a schema grammar into the registry
       * This method is for internal use only: it assumes that a grammar with
*** 189,199 ****
                  gs = sg1.getImportedGrammars();
                  // for all grammars imported by sg2, but not in the vector
                  // we add them to the vector
                  if(gs == null) continue;
                  for (int j = gs.size() - 1; j >= 0; j--) {
!                     sg2 = (SchemaGrammar)gs.get(j);
                      if (!grammars.contains(sg2))
                          grammars.add(sg2);
                  }
              }
              // we found one with the same target namespace, ignore it
--- 189,199 ----
                  gs = sg1.getImportedGrammars();
                  // for all grammars imported by sg2, but not in the vector
                  // we add them to the vector
                  if(gs == null) continue;
                  for (int j = gs.size() - 1; j >= 0; j--) {
!                     sg2 = gs.get(j);
                      if (!grammars.contains(sg2))
                          grammars.add(sg2);
                  }
              }
              // we found one with the same target namespace, ignore it