7021922: java.lang.annoation.IncompleteExceptions throws NPE when type is null
Reviewed-by: alanb, forax
diff --git a/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java b/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
index 7d7c2b1..dcd4f2a 100644
--- a/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
+++ b/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
@@ -41,21 +41,23 @@
public class IncompleteAnnotationException extends RuntimeException {
private static final long serialVersionUID = 8445097402741811912L;
- private Class annotationType;
+ private Class<? extends Annotation> annotationType;
private String elementName;
-
/**
* Constructs an IncompleteAnnotationException to indicate that
* the named element was missing from the specified annotation type.
*
* @param annotationType the Class object for the annotation type
* @param elementName the name of the missing element
+ * @throws NullPointerException if either parameter is {@code null}
*/
public IncompleteAnnotationException(
Class<? extends Annotation> annotationType,
String elementName) {
- super(annotationType.getName() + " missing element " + elementName);
+ super(annotationType.getName().toString() +
+ " missing element " +
+ elementName.toString());
this.annotationType = annotationType;
this.elementName = elementName;
diff --git a/test/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java b/test/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java
new file mode 100644
index 0000000..9e9e7a7
--- /dev/null
+++ b/test/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7021922
+ * @summary Test null handling of IncompleteAnnotationException constructor
+ * @author Joseph D. Darcy
+ */
+
+import java.lang.annotation.*;
+
+public class TestIncompleteAnnotationExceptionNPE {
+ public static void main(String... args) {
+ int errors = 0;
+ Class<? extends Annotation> annotationType = Annotation.class;
+ String elementName = "name";
+
+ try {
+ Object o = new IncompleteAnnotationException(null, null);
+ errors++;
+ } catch(NullPointerException npe) {
+ ; // Expected
+ }
+
+ try {
+ Object o = new IncompleteAnnotationException(annotationType, null);
+ errors++;
+ } catch(NullPointerException npe) {
+ ; // Expected
+ }
+
+ try {
+ Object o = new IncompleteAnnotationException(null, elementName);
+ errors++;
+ } catch(NullPointerException npe) {
+ ; // Expected
+ }
+
+ if (errors != 0)
+ throw new RuntimeException("Encountered " + errors +
+ " error(s) during construction.");
+ }
+}