src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java

rev 1063 : 8172974: [JAXP] XALAN: Wrong result when transforming namespace unaware StAX Input

*** 74,84 ****
  
      // A reference to the stylesheet being compiled.
      private Stylesheet _stylesheet;
  
      // Counters used by various classes to generate unique names.
-     // private int _variableSerial     = 1;
      private int _modeSerial         = 1;
      private int _stylesheetSerial   = 1;
      private int _stepPatternSerial  = 1;
      private int _helperClassSerial  = 0;
      private int _attributeSetSerial = 0;
--- 74,83 ----
*** 141,169 ****
  
      /**
       * protocols allowed for external references set by the stylesheet processing instruction, Import and Include element.
       */
      private String _accessExternalStylesheet = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
!      /**
       * protocols allowed for external DTD references in source file and/or stylesheet.
       */
      private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
  
      private XMLSecurityManager _xmlSecurityManager;
  
      private final JdkXmlFeatures _xmlFeatures;
  
      /**
!     *  Extension function class loader variables
!     */
  
!     /* Class loader reference that will be used for external extension functions loading */
      private ClassLoader _extensionClassLoader;
  
      /**
!     *  HashMap with the loaded classes
!     */
      private final Map<String, Class<?>> _externalExtensionFunctions;
  
      /**
       * Catalog features
       */
--- 140,171 ----
  
      /**
       * protocols allowed for external references set by the stylesheet processing instruction, Import and Include element.
       */
      private String _accessExternalStylesheet = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
! 
!     /**
       * protocols allowed for external DTD references in source file and/or stylesheet.
       */
      private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
  
      private XMLSecurityManager _xmlSecurityManager;
  
      private final JdkXmlFeatures _xmlFeatures;
  
      /**
!      *  Extension function class loader variables
!      */
  
!     /**
!      * Class loader reference that will be used for external extension functions loading
!      */
      private ClassLoader _extensionClassLoader;
  
      /**
!      *  HashMap with the loaded classes
!      */
      private final Map<String, Class<?>> _externalExtensionFunctions;
  
      /**
       * Catalog features
       */
*** 303,313 ****
          if (_isSecureProcessing && clazz != null && !_externalExtensionFunctions.containsKey(name)) {
              _externalExtensionFunctions.put(name, clazz);
          }
      }
  
!     /*
       * Function loads an external extension function.
       * The filtering of function types (external,internal) takes place in FunctionCall class
       *
       */
      Class loadExternalFunction(String name) throws ClassNotFoundException {
--- 305,315 ----
          if (_isSecureProcessing && clazz != null && !_externalExtensionFunctions.containsKey(name)) {
              _externalExtensionFunctions.put(name, clazz);
          }
      }
  
!     /**
       * Function loads an external extension function.
       * The filtering of function types (external,internal) takes place in FunctionCall class
       *
       */
      Class loadExternalFunction(String name) throws ClassNotFoundException {
*** 324,337 ****
          }
          //Return loaded class
          return (Class) loaded;
      }
  
!     /*
       * Returns unmodifiable view of HashMap with loaded external extension
       * functions - will be needed for the TransformerImpl
!     */
      public Map<String, Class<?>> getExternalExtensionFunctions() {
          return Collections.unmodifiableMap(_externalExtensionFunctions);
      }
  
      /**
--- 326,339 ----
          }
          //Return loaded class
          return (Class) loaded;
      }
  
!     /**
       * Returns unmodifiable view of HashMap with loaded external extension
       * functions - will be needed for the TransformerImpl
!      */
      public Map<String, Class<?>> getExternalExtensionFunctions() {
          return Collections.unmodifiableMap(_externalExtensionFunctions);
      }
  
      /**
*** 346,356 ****
          _namesIndex     = new Vector(128);
          _namespaceIndex = new Vector(32);
          _namespacePrefixes = new HashMap<>();
          _stylesheet     = null;
          _parser.init();
-         //_variableSerial     = 1;
          _modeSerial         = 1;
          _stylesheetSerial   = 1;
          _stepPatternSerial  = 1;
          _helperClassSerial  = 0;
          _attributeSetSerial = 0;
--- 348,357 ----