jdk-sandbox: comparison src/java.xml/share/classes/org/xml/sax/SAXException.java

equal deleted inserted replaced

-:423bcbb288ff
+:a262b919311a
 /*
-* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2000, 2018, 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
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
 // $Id: SAXException.java,v 1.3 2004/11/03 22:55:32 jsuttor Exp $
 package org.xml.sax;
+import java.io.IOException;
+import java.io.InvalidClassException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamField;
 /**
 * Encapsulate a general SAX error or warning.
 *
 * <blockquote>
 * Create a new SAXException.
 */
 public SAXException ()
 {
 super();
-this.exception = null;
 }
 /**
 * Create a new SAXException.
 *
 * @param message The error or warning message.
 */
 public SAXException (String message) {
 super(message);
-this.exception = null;
 }
 /**
 * Create a new SAXException wrapping an existing exception.
 *
 * @param e The exception to be wrapped in a SAXException.
 */
 public SAXException (Exception e)
 {
-super();
+super(e);
-this.exception = e;
 }
 /**
 * Create a new SAXException from an existing exception.
 * @param message The detail message.
 * @param e The exception to be wrapped in a SAXException.
 */
 public SAXException (String message, Exception e)
 {
-super(message);
+super(message, e);
-this.exception = e;
 }
 /**
 * Return a detail message for this exception.
 * @return The error or warning message.
 */
 public String getMessage ()
 {
 String message = super.getMessage();
+Throwable cause = super.getCause();
-if (message == null && exception != null) {
-return exception.getMessage();
+if (message == null && cause != null) {
+return cause.getMessage();
 } else {
 return message;
 }
 }
 /**
 * Return the embedded exception, if any.
 *
 * @return The embedded exception, or null if there is none.
 */
 public Exception getException ()
 {
-return exception;
+return getExceptionInternal();
 }
 /**
 * Return the cause of the exception
 *
 * @return Return the cause of the exception
 */
 public Throwable getCause() {
-return exception;
+return super.getCause();
 }
 /**
 * Override toString to pick up any embedded exception.
 *
 * @return A string representation of this exception.
 */
 public String toString ()
 {
+Throwable exception = super.getCause();
 if (exception != null) {
 return super.toString() + "\n" + exception.toString();
 } else {
 return super.toString();
 }
 //////////////////////////////////////////////////////////////////////
 // Internal state.
 //////////////////////////////////////////////////////////////////////
+private static final ObjectStreamField[] serialPersistentFields = {
-/**
+new ObjectStreamField( "exception", Exception.class )
-* @serial The embedded exception if tunnelling, or null.
+};
-*/
-private Exception exception;
+/**
+* Writes "exception" field to the stream.
+*
+* @param out stream used for serialization.
+* @throws IOException thrown by <code>ObjectOutputStream</code>
+*/
+private void writeObject(ObjectOutputStream out)
+throws IOException {
+ObjectOutputStream.PutField fields = out.putFields();
+fields.put("exception", getExceptionInternal());
+out.writeFields();
+}
+/**
+* Reads the "exception" field from the stream.
+* And initializes the "exception" if it wasn't
+* done before.
+*
+* @param in stream used for deserialization
+* @throws IOException            thrown by <code>ObjectInputStream</code>
+* @throws ClassNotFoundException thrown by <code>ObjectInputStream</code>
+*/
+private void readObject(ObjectInputStream in)
+throws IOException, ClassNotFoundException {
+ObjectInputStream.GetField fields = in.readFields();
+Exception exception = (Exception) fields.get("exception", null);
+Throwable superCause = super.getCause();
+// if super.getCause() and 'exception' fields present then always use
+// getCause() value. Otherwise, use 'exception' to initialize cause
+if (superCause == null && exception != null) {
+try {
+super.initCause(exception);
+} catch (IllegalStateException e) {
+throw new InvalidClassException("Inconsistent state: two causes");
+}
+}
+}
+// Internal method to guard against overriding of public getException
+// method by SAXException subclasses
+private Exception getExceptionInternal() {
+Throwable cause = super.getCause();
+if (cause instanceof Exception) {
+return (Exception) cause;
+} else {
+return null;
+}
+}
 // Added serialVersionUID to preserve binary compatibility
 static final long serialVersionUID = 583241635256073760L;
 }

changeset 48837	a262b919311a
parent 47216	71c04702a3d5
child 58247	3aef3bccfae3