archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8009579: Xpathexception does not honor initcause()

Browse source 
Reviewed-by: alanb, dholmes, joehw
This commit is contained in:
Aleksej Efimov 2013-06-06 20:40:43 +04:00 • committed by Dmeetry Degrave
parent 520adaac29
commit 53ae44836c
1 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

55
jaxp/src/javax/xml/xpath/XPathException.java
View file

@ -26,6 +26,11 @@
package javax.xml.xpath; package javax.xml.xpath;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectStreamField;
import java.io.InvalidClassException;
/** /**
* <code>XPathException</code> represents a generic XPath exception.</p> * <code>XPathException</code> represents a generic XPath exception.</p>
@ -36,7 +41,9 @@ import java.io.PrintWriter;
*/ */
public class XPathException extends Exception { public class XPathException extends Exception {
private final Throwable cause; private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField( "cause", Throwable.class )
};
/** /**
* <p>Stream Unique Identifier.</p> * <p>Stream Unique Identifier.</p>
@ -62,7 +69,6 @@ public class XPathException extends Exception {
if ( message == null ) { if ( message == null ) {
throw new NullPointerException ( "message can't be null"); throw new NullPointerException ( "message can't be null");
} }
this.cause = null;
} }
/** /**
@ -77,8 +83,7 @@ public class XPathException extends Exception {
* @throws NullPointerException if <code>cause</code> is <code>null</code>. * @throws NullPointerException if <code>cause</code> is <code>null</code>.
*/ */
public XPathException(Throwable cause) { public XPathException(Throwable cause) {
super(); super(cause);
this.cause = cause;
if ( cause == null ) { if ( cause == null ) {
throw new NullPointerException ( "cause can't be null"); throw new NullPointerException ( "cause can't be null");
} }
@ -90,7 +95,47 @@ public class XPathException extends Exception {
* @return Cause of this XPathException. * @return Cause of this XPathException.
*/ */
public Throwable getCause() { public Throwable getCause() {
return cause; return super.getCause();
}
/**
* Writes "cause" field to the stream.
* The cause is got from the parent class.
*
* @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("cause", (Throwable) super.getCause());
out.writeFields();
}
/**
* Reads the "cause" field from the stream.
* And initializes the "cause" 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();
Throwable scause = (Throwable) fields.get("cause", null);
if (super.getCause() == null && scause != null) {
try {
super.initCause(scause);
} catch(IllegalStateException e) {
throw new InvalidClassException("Inconsistent state: two causes");
}
}
} }
/** /**