jdk-sandbox: comparison jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerException.java

equal deleted inserted replaced

-:a9fa15f3dee6
+:49e2e73f90f6
 /*
-* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 package javax.xml.transform;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.CodeSigner;
+import java.security.CodeSource;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
+import java.util.Objects;
 /**
-* This class specifies an exceptional condition that occured
+* This class specifies an exceptional condition that occurred
 * during the transformation process.
 *
 * @since 1.4
 */
 public class TransformerException extends Exception {
-/** Field locator specifies where the error occured */
+/** Field locator specifies where the error occurred */
 SourceLocator locator;
 /**
 * Method getLocator retrieves an instance of a SourceLocator
-* object that specifies where an error occured.
+* object that specifies where an error occurred.
 *
 * @return A SourceLocator object, or null if none was specified.
 */
 public SourceLocator getLocator() {
-return locator;
+return this.locator;
 }
 /**
 * Method setLocator sets an instance of a SourceLocator
-* object that specifies where an error occured.
+* object that specifies where an error occurred.
 *
 * @param location A SourceLocator object, or null to clear the location.
 */
 public void setLocator(SourceLocator location) {
-locator = location;
+this.locator = location;
 }
 /** Field containedException specifies a wrapped exception.  May be null. */
 Throwable containedException;
 /**
 * Returns the cause of this throwable or <code>null</code> if the
 * cause is nonexistent or unknown.  (The cause is the throwable that
 * caused this throwable to get thrown.)
-*/
+* @return the cause, or null if unknown
+*/
+@Override
 public Throwable getCause() {
 return ((containedException == this)
 ? null
 : containedException);
 * @throws IllegalStateException if this throwable was
 *         created with {@link #TransformerException(Throwable)} or
 *         {@link #TransformerException(String,Throwable)}, or this method has already
 *         been called on this throwable.
 */
+@Override
 public synchronized Throwable initCause(Throwable cause) {
 // TransformerException doesn't set its cause (probably
 // because it predates initCause()) - and we may not want
 // to change this since Exceptions are serializable...
 * Create a new TransformerException.
 *
 * @param message The error or warning message.
 */
 public TransformerException(String message) {
+this(message, null, null);
-super(message);
-this.containedException = null;
-this.locator            = null;
 }
 /**
 * Create a new TransformerException wrapping an existing exception.
 *
 * @param e The exception to be wrapped.
 */
 public TransformerException(Throwable e) {
+this(null, null, e);
-super(e.toString());
-this.containedException = e;
-this.locator            = null;
 }
 /**
 * Wrap an existing exception in a TransformerException.
 *
 * @param message The error or warning message, or null to
 *                use the message from the embedded exception.
 * @param e Any exception
 */
 public TransformerException(String message, Throwable e) {
+this(message, null, e);
-super(((message == null) || (message.length() == 0))
-? e.toString()
-: message);
-this.containedException = e;
-this.locator            = null;
 }
 /**
 * Create a new TransformerException from a message and a Locator.
 *
 *
 * @param message The error or warning message.
 * @param locator The locator object for the error or warning.
 */
 public TransformerException(String message, SourceLocator locator) {
+this(message, locator, null);
-super(message);
-this.containedException = null;
-this.locator            = locator;
 }
 /**
 * Wrap an existing exception in a TransformerException.
 *
 * @param locator The locator object for the error or warning.
 * @param e Any exception
 */
 public TransformerException(String message, SourceLocator locator,
 Throwable e) {
+super(((message == null) || (message.length() == 0))
-super(message);
+? ((e == null) ? "" : e.toString())
+: message);
 this.containedException = e;
 this.locator            = locator;
 }
 *
 * @return A <code>String</code> representing the error message with
 *         location information appended.
 */
 public String getMessageAndLocation() {
+StringBuilder sbuffer = new StringBuilder();
-StringBuffer sbuffer = new StringBuffer();
+sbuffer.append(Objects.toString(super.getMessage(), ""));
-String       message = super.getMessage();
+sbuffer.append(Objects.toString(getLocationAsString(), ""));
-if (null != message) {
+return sbuffer.toString();
-sbuffer.append(message);
+}
-}
+/**
-if (null != locator) {
+* Get the location information as a string.
-String systemID = locator.getSystemId();
+*
-int    line     = locator.getLineNumber();
+* @return A string with location info, or null
-int    column   = locator.getColumnNumber();
+* if there is no location information.
+*/
+public String getLocationAsString() {
+if (locator == null) {
+return null;
+}
+if (System.getSecurityManager() == null) {
+return getLocationString();
+} else {
+return AccessController.doPrivileged((PrivilegedAction<String>) () ->
+getLocationString(),
+new AccessControlContext(new ProtectionDomain[] {getNonPrivDomain()}));
+}
+}
+/**
+* Constructs the location string.
+* @return the location string
+*/
+private String getLocationString() {
+if (locator == null) {
+return null;
+}
+StringBuilder sbuffer  = new StringBuilder();
+String       systemID = locator.getSystemId();
+int          line     = locator.getLineNumber();
+int          column   = locator.getColumnNumber();
 if (null != systemID) {
 sbuffer.append("; SystemID: ");
 sbuffer.append(systemID);
 }
 if (0 != column) {
 sbuffer.append("; Column#: ");
 sbuffer.append(column);
 }
-}
-return sbuffer.toString();
-}
-/**
-* Get the location information as a string.
-*
-* @return A string with location info, or null
-* if there is no location information.
-*/
-public String getLocationAsString() {
-if (null != locator) {
-StringBuffer sbuffer  = new StringBuffer();
-String       systemID = locator.getSystemId();
-int          line     = locator.getLineNumber();
-int          column   = locator.getColumnNumber();
-if (null != systemID) {
-sbuffer.append("; SystemID: ");
-sbuffer.append(systemID);
-}
-if (0 != line) {
-sbuffer.append("; Line#: ");
-sbuffer.append(line);
-}
-if (0 != column) {
-sbuffer.append("; Column#: ");
-sbuffer.append(column);
-}
 return sbuffer.toString();
-} else {
-return null;
-}
 }
 /**
 * Print the the trace of methods from where the error
 * originated.  This will trace all nested exception
 * objects, as well as this object.
 */
+@Override
 public void printStackTrace() {
 printStackTrace(new java.io.PrintWriter(System.err, true));
 }
 /**
 * Print the the trace of methods from where the error
 * originated.  This will trace all nested exception
 * objects, as well as this object.
 * @param s The stream where the dump will be sent to.
 */
+@Override
 public void printStackTrace(java.io.PrintStream s) {
 printStackTrace(new java.io.PrintWriter(s));
 }
 /**
 * Print the the trace of methods from where the error
 * originated.  This will trace all nested exception
 * objects, as well as this object.
 * @param s The writer where the dump will be sent to.
 */
+@Override
 public void printStackTrace(java.io.PrintWriter s) {
 if (s == null) {
 s = new java.io.PrintWriter(System.err, true);
 }
 break;
 }
 } else {
 exception = null;
 }
-} catch (InvocationTargetException ite) {
+} catch (InvocationTargetException | IllegalAccessException
-exception = null;
+| NoSuchMethodException e) {
-} catch (IllegalAccessException iae) {
-exception = null;
-} catch (NoSuchMethodException nsme) {
 exception = null;
 }
 }
 } finally {
 // ensure output is written
 s.flush();
 }
 }
+/**
+* Creates a ProtectionDomain that has no permission.
+* @return a ProtectionDomain
+*/
+private ProtectionDomain getNonPrivDomain() {
+CodeSource nullSource = new CodeSource(null, (CodeSigner[]) null);
+PermissionCollection noPermission = new Permissions();
+return new ProtectionDomain(nullSource, noPermission);
 }
+}

changeset 46005	49e2e73f90f6
parent 31497	4a6b2e733c0d
child 46006	20a06a196ed5