changeset 1604:7afdf9d0bc2c

Merge
author alanb
date Sat, 05 Sep 2009 15:57:25 +0100
parents 87a2ef2439bc 704296144175
children abb69e8b1774
files
diffstat 2 files changed, 28 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/lang/Character.java	Fri Sep 04 22:22:55 2009 +0100
+++ b/src/share/classes/java/lang/Character.java	Sat Sep 05 15:57:25 2009 +0100
@@ -2587,9 +2587,9 @@
      * significantly better space and time performance by caching
      * frequently requested values.
      *
-     * This method will always cache values in the range '\u0000'
-     * to '\u007f'", inclusive, and may cache other values outside
-     * of this range.
+     * This method will always cache values in the range {@code
+     * '\u005Cu0000'} to {@code '\u005Cu007f'}, inclusive, and may
+     * cache other values outside of this range.
      *
      * @param  c a char value.
      * @return a <tt>Character</tt> instance representing <tt>c</tt>.
--- a/test/java/lang/reflect/Generics/Probe.java	Fri Sep 04 22:22:55 2009 +0100
+++ b/test/java/lang/reflect/Generics/Probe.java	Sat Sep 05 15:57:25 2009 +0100
@@ -23,11 +23,9 @@
 
 /*
  * @test
- * @bug 5003916 6704655
+ * @bug 5003916 6704655 6873951
  * @summary Testing parsing of signatures attributes of nested classes
  * @author Joseph D. Darcy
- * @compile -source 1.5 Probe.java
- * @run main Probe
  */
 
 import java.lang.reflect.*;
@@ -35,51 +33,35 @@
 import java.util.*;
 import static java.util.Arrays.*;
 
-@Classes(value={
-        "java.util.concurrent.FutureTask",
-        "java.util.concurrent.ConcurrentHashMap$EntryIterator",
-        "java.util.concurrent.ConcurrentHashMap$KeyIterator",
-        "java.util.concurrent.ConcurrentHashMap$ValueIterator",
-        "java.util.AbstractList$ListItr",
-        "java.util.EnumMap$EntryIterator",
-        "java.util.EnumMap$KeyIterator",
-        "java.util.EnumMap$ValueIterator",
-        "java.util.IdentityHashMap$EntryIterator",
-        "java.util.IdentityHashMap$KeyIterator",
-        "java.util.IdentityHashMap$ValueIterator",
-        "java.util.WeakHashMap$EntryIterator",
-        "java.util.WeakHashMap$KeyIterator",
-        "java.util.WeakHashMap$ValueIterator",
-        "java.util.TreeMap$EntryIterator",
-        "java.util.TreeMap$KeyIterator",
-        "java.util.TreeMap$ValueIterator",
-        "java.util.HashMap$EntryIterator",
-        "java.util.HashMap$KeyIterator",
-        "java.util.HashMap$ValueIterator",
-        "java.util.LinkedHashMap$EntryIterator",
-        "java.util.LinkedHashMap$KeyIterator",
-        "java.util.LinkedHashMap$ValueIterator"
-        },
-        sunClasses={
-        "javax.crypto.SunJCE_c",
-        "javax.crypto.SunJCE_e",
-        "javax.crypto.SunJCE_f",
-        "javax.crypto.SunJCE_j",
-        "javax.crypto.SunJCE_k",
-        "javax.crypto.SunJCE_l"
-        })
+@Classes({"java.util.concurrent.FutureTask",
+          "java.util.concurrent.ConcurrentHashMap$EntryIterator",
+          "java.util.concurrent.ConcurrentHashMap$KeyIterator",
+          "java.util.concurrent.ConcurrentHashMap$ValueIterator",
+          "java.util.AbstractList$ListItr",
+          "java.util.EnumMap$EntryIterator",
+          "java.util.EnumMap$KeyIterator",
+          "java.util.EnumMap$ValueIterator",
+          "java.util.IdentityHashMap$EntryIterator",
+          "java.util.IdentityHashMap$KeyIterator",
+          "java.util.IdentityHashMap$ValueIterator",
+          "java.util.WeakHashMap$EntryIterator",
+          "java.util.WeakHashMap$KeyIterator",
+          "java.util.WeakHashMap$ValueIterator",
+          "java.util.TreeMap$EntryIterator",
+          "java.util.TreeMap$KeyIterator",
+          "java.util.TreeMap$ValueIterator",
+          "java.util.HashMap$EntryIterator",
+          "java.util.HashMap$KeyIterator",
+          "java.util.HashMap$ValueIterator",
+          "java.util.LinkedHashMap$EntryIterator",
+          "java.util.LinkedHashMap$KeyIterator",
+          "java.util.LinkedHashMap$ValueIterator"})
 public class Probe {
-    public static void main (String[] args) throws Throwable {
+    public static void main (String... args) throws Throwable {
         Classes classesAnnotation = (Probe.class).getAnnotation(Classes.class);
         List<String> names =
             new ArrayList<String>(asList(classesAnnotation.value()));
 
-        if (System.getProperty("java.runtime.name").startsWith("Java(TM)")) {
-            // Sun production JDK; test crypto classes too
-            for(String name: classesAnnotation.sunClasses())
-                names.add(name);
-        }
-
         int errs = 0;
         for(String name: names) {
             System.out.println("\nCLASS " + name);
@@ -152,5 +134,4 @@
 @Retention(RetentionPolicy.RUNTIME)
 @interface Classes {
     String [] value(); // list of classes to probe
-    String [] sunClasses(); // list of Sun-production JDK specific classes to probe
 }