src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java

rev 959 : 8162598: XSLTC transformer swallows empty namespace declaration which is needed to undeclare default namespace

*** 1,7 ****
  /*
!  * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
   */
  /*
   * 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,7 ----
  /*
!  * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
   */
  /*
   * 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.
*** 15,27 ****
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
- /*
-  * $Id: TransformerFactoryImpl.java,v 1.8 2007/04/09 21:30:41 joehw Exp $
-  */
  
  package com.sun.org.apache.xalan.internal.xsltc.trax;
  
  import com.sun.org.apache.xalan.internal.XalanConstants;
  import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
--- 15,24 ----
*** 46,55 ****
--- 43,53 ----
  import java.io.FilenameFilter;
  import java.io.IOException;
  import java.io.InputStream;
  import java.net.MalformedURLException;
  import java.net.URL;
+ import java.util.ArrayList;
  import java.util.Enumeration;
  import java.util.Map;
  import java.util.Properties;
  import java.util.Vector;
  import java.util.zip.ZipEntry;
*** 596,606 ****
              ErrorMsg err = new ErrorMsg(ErrorMsg.JAXP_GET_FEATURE_NULL_NAME);
              throw new NullPointerException(err.toString());
          }
  
          // Inefficient, but array is small
!         for (int i =0; i < features.length; i++) {
              if (name.equals(features[i])) {
                  return true;
              }
          }
          // secure processing?
--- 594,604 ----
              ErrorMsg err = new ErrorMsg(ErrorMsg.JAXP_GET_FEATURE_NULL_NAME);
              throw new NullPointerException(err.toString());
          }
  
          // Inefficient, but array is small
!         for (int i = 0; i < features.length; i++) {
              if (name.equals(features[i])) {
                  return true;
              }
          }
          // secure processing?
*** 803,822 ****
      }
  
      /**
       * Pass warning messages from the compiler to the error listener
       */
!     private void passWarningsToListener(Vector messages)
          throws TransformerException
      {
          if (_errorListener == null || messages == null) {
              return;
          }
          // Pass messages to listener, one by one
          final int count = messages.size();
          for (int pos = 0; pos < count; pos++) {
!             ErrorMsg msg = (ErrorMsg)messages.elementAt(pos);
              // Workaround for the TCK failure ErrorListener.errorTests.error001.
              if (msg.isWarningError())
                  _errorListener.error(
                      new TransformerConfigurationException(msg.toString()));
              else
--- 801,820 ----
      }
  
      /**
       * Pass warning messages from the compiler to the error listener
       */
!     private void passWarningsToListener(ArrayList<ErrorMsg> messages)
          throws TransformerException
      {
          if (_errorListener == null || messages == null) {
              return;
          }
          // Pass messages to listener, one by one
          final int count = messages.size();
          for (int pos = 0; pos < count; pos++) {
!             ErrorMsg msg = messages.get(pos);
              // Workaround for the TCK failure ErrorListener.errorTests.error001.
              if (msg.isWarningError())
                  _errorListener.error(
                      new TransformerConfigurationException(msg.toString()));
              else
*** 826,844 ****
      }
  
      /**
       * Pass error messages from the compiler to the error listener
       */
!     private void passErrorsToListener(Vector messages) {
          try {
              if (_errorListener == null || messages == null) {
                  return;
              }
              // Pass messages to listener, one by one
              final int count = messages.size();
              for (int pos = 0; pos < count; pos++) {
!                 String message = messages.elementAt(pos).toString();
                  _errorListener.error(new TransformerException(message));
              }
          }
          catch (TransformerException e) {
              // nada
--- 824,842 ----
      }
  
      /**
       * Pass error messages from the compiler to the error listener
       */
!     private void passErrorsToListener(ArrayList<ErrorMsg> messages) {
          try {
              if (_errorListener == null || messages == null) {
                  return;
              }
              // Pass messages to listener, one by one
              final int count = messages.size();
              for (int pos = 0; pos < count; pos++) {
!                 String message = messages.get(pos).toString();
                  _errorListener.error(new TransformerException(message));
              }
          }
          catch (TransformerException e) {
              // nada
*** 890,900 ****
          if (_autoTranslet)  {
              byte[][] bytecodes;
              String transletClassName = getTransletBaseName(source);
  
              if (_packageName != null)
!                transletClassName = _packageName + "." + transletClassName;
  
              if (_jarFileName != null)
                  bytecodes = getBytecodesFromJar(source, transletClassName);
              else
                  bytecodes = getBytecodesFromClasses(source, transletClassName);
--- 888,898 ----
          if (_autoTranslet)  {
              byte[][] bytecodes;
              String transletClassName = getTransletBaseName(source);
  
              if (_packageName != null)
!                 transletClassName = _packageName + "." + transletClassName;
  
              if (_jarFileName != null)
                  bytecodes = getBytecodesFromJar(source, transletClassName);
              else
                  bytecodes = getBytecodesFromClasses(source, transletClassName);
*** 1009,1022 ****
              xsltc.printWarnings();
          }
  
          // Check that the transformation went well before returning
      if (bytecodes == null) {
!         Vector errs = xsltc.getErrors();
          ErrorMsg err;
          if (errs != null) {
!             err = (ErrorMsg)errs.elementAt(errs.size()-1);
          } else {
              err = new ErrorMsg(ErrorMsg.JAXP_COMPILE_ERR);
          }
          Throwable cause = err.getCause();
          TransformerConfigurationException exc;
--- 1007,1020 ----
              xsltc.printWarnings();
          }
  
          // Check that the transformation went well before returning
      if (bytecodes == null) {
!         ArrayList<ErrorMsg> errs = xsltc.getErrors();
          ErrorMsg err;
          if (errs != null) {
!             err = errs.get(errs.size()-1);
          } else {
              err = new ErrorMsg(ErrorMsg.JAXP_COMPILE_ERR);
          }
          Throwable cause = err.getCause();
          TransformerConfigurationException exc;