diff --git a/jdk/src/share/classes/java/dyn/InvokeDynamicBootstrapError.java b/jdk/src/share/classes/java/dyn/InvokeDynamicBootstrapError.java index 83ebcd464b4..a301dfa42bc 100644 --- a/jdk/src/share/classes/java/dyn/InvokeDynamicBootstrapError.java +++ b/jdk/src/share/classes/java/dyn/InvokeDynamicBootstrapError.java @@ -39,8 +39,11 @@ package java.dyn; * {@link Linkage#registerBootstrapMethod registerBootstrapMethod}. * * @author John Rose, JSR 292 EG + * @since 1.7 */ public class InvokeDynamicBootstrapError extends LinkageError { + private static final long serialVersionUID = 292L; + /** * Constructs an {@code InvokeDynamicBootstrapError} with no detail message. */ @@ -63,10 +66,9 @@ public class InvokeDynamicBootstrapError extends LinkageError { * detail message and cause. * * @param s the detail message. - * @param cause the cause. + * @param cause the cause, may be {@code null}. */ public InvokeDynamicBootstrapError(String s, Throwable cause) { - super(s); - this.initCause(cause); + super(s, cause); } } diff --git a/jdk/src/share/classes/java/dyn/LinkagePermission.java b/jdk/src/share/classes/java/dyn/LinkagePermission.java index 4478d959853..6f6dc5004eb 100644 --- a/jdk/src/share/classes/java/dyn/LinkagePermission.java +++ b/jdk/src/share/classes/java/dyn/LinkagePermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2010, 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 @@ -81,6 +81,8 @@ import java.util.StringTokenizer; */ public final class LinkagePermission extends BasicPermission { + private static final long serialVersionUID = 292L; + /** * Create a new LinkagePermission with the given name. * The name is the symbolic name of the LinkagePermission, such as diff --git a/jdk/src/share/classes/java/dyn/NoAccessException.java b/jdk/src/share/classes/java/dyn/NoAccessException.java index 5e76f6a4aae..6b2fbcebcae 100644 --- a/jdk/src/share/classes/java/dyn/NoAccessException.java +++ b/jdk/src/share/classes/java/dyn/NoAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2010, 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 @@ -35,8 +35,11 @@ package java.dyn; * on behalf of the method handle creator, * at the time of creation. * @author John Rose, JSR 292 EG + * @since 1.7 */ public class NoAccessException extends RuntimeException { + private static final long serialVersionUID = 292L; + /** * Constructs a {@code NoAccessException} with no detail message. */ diff --git a/jdk/src/share/classes/java/dyn/WrongMethodTypeException.java b/jdk/src/share/classes/java/dyn/WrongMethodTypeException.java index 36e687c8d3d..4c4c99817ff 100644 --- a/jdk/src/share/classes/java/dyn/WrongMethodTypeException.java +++ b/jdk/src/share/classes/java/dyn/WrongMethodTypeException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2010, 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 @@ -38,8 +38,11 @@ package java.dyn; * instead of when the mismatched method handle is called. * * @author John Rose, JSR 292 EG + * @since 1.7 */ public class WrongMethodTypeException extends RuntimeException { + private static final long serialVersionUID = 292L; + /** * Constructs a {@code WrongMethodTypeException} with no detail message. */ diff --git a/jdk/src/share/classes/java/lang/LinkageError.java b/jdk/src/share/classes/java/lang/LinkageError.java index 0954a178343..6b5f060f0e7 100644 --- a/jdk/src/share/classes/java/lang/LinkageError.java +++ b/jdk/src/share/classes/java/lang/LinkageError.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2010, 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 @@ -26,7 +26,7 @@ package java.lang; /** - * Subclasses of LinkageError indicate that a class has + * Subclasses of {@code LinkageError} indicate that a class has * some dependency on another class; however, the latter class has * incompatibly changed after the compilation of the former class. * @@ -39,14 +39,14 @@ class LinkageError extends Error { private static final long serialVersionUID = 3579600108157160122L; /** - * Constructs a LinkageError with no detail message. + * Constructs a {@code LinkageError} with no detail message. */ public LinkageError() { super(); } /** - * Constructs a LinkageError with the specified detail + * Constructs a {@code LinkageError} with the specified detail * message. * * @param s the detail message. @@ -54,4 +54,16 @@ class LinkageError extends Error { public LinkageError(String s) { super(s); } + + /** + * Constructs a {@code LinkageError} with the specified detail + * message and cause. + * + * @param s the detail message. + * @param cause the cause, may be {@code null} + * @since 1.7 + */ + public LinkageError(String s, Throwable cause) { + super(s, cause); + } }