changeset 5875:c68f28843814

Merge
author ewendeli
date Fri, 18 Jan 2013 22:01:17 +0100
parents 8eb180a284b0 a177f85250d2
children 81cc809b7f78
files src/share/lib/security/java.security src/share/lib/security/java.security-macosx src/share/lib/security/java.security-solaris src/share/lib/security/java.security-windows test/Makefile
diffstat 6 files changed, 25 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/lang/ref/Finalizer.java	Tue Jan 15 18:57:42 2013 -0800
+++ b/src/share/classes/java/lang/ref/Finalizer.java	Fri Jan 18 22:01:17 2013 +0100
@@ -38,9 +38,9 @@
      */
     static native void invokeFinalizeMethod(Object o) throws Throwable;
 
-    static private ReferenceQueue queue = new ReferenceQueue();
-    static private Finalizer unfinalized = null;
-    static private Object lock = new Object();
+    private static ReferenceQueue queue = new ReferenceQueue();
+    private static Finalizer unfinalized = null;
+    private static final Object lock = new Object();
 
     private Finalizer
         next = null,
@@ -142,7 +142,11 @@
     /* Called by Runtime.runFinalization() */
     static void runFinalization() {
         forkSecondaryFinalizer(new Runnable() {
+            private volatile boolean running;
             public void run() {
+                if (running)
+                    return;
+                running = true;
                 for (;;) {
                     Finalizer f = (Finalizer)queue.poll();
                     if (f == null) break;
@@ -155,7 +159,11 @@
     /* Invoked by java.lang.Shutdown */
     static void runAllFinalizers() {
         forkSecondaryFinalizer(new Runnable() {
+            private volatile boolean running;
             public void run() {
+                if (running)
+                    return;
+                running = true;
                 for (;;) {
                     Finalizer f;
                     synchronized (lock) {
@@ -168,10 +176,14 @@
     }
 
     private static class FinalizerThread extends Thread {
+        private volatile boolean running;
         FinalizerThread(ThreadGroup g) {
             super(g, "Finalizer");
         }
         public void run() {
+            if (running)
+                return;
+            running = true;
             for (;;) {
                 try {
                     Finalizer f = (Finalizer)queue.remove();
--- a/src/share/lib/security/java.security	Tue Jan 15 18:57:42 2013 -0800
+++ b/src/share/lib/security/java.security	Fri Jan 18 22:01:17 2013 +0100
@@ -133,8 +133,7 @@
                com.sun.jmx.remote.util.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.glassfish.external.,\
-               com.sun.org.glassfish.gmbal.
+               com.sun.org.glassfish.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -156,8 +155,7 @@
                    com.sun.jmx.remote.util.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.glassfish.external.,\
-                   com.sun.org.glassfish.gmbal.
+                   com.sun.org.glassfish.
 
 #
 # Determines whether this properties file can be appended to
--- a/src/share/lib/security/java.security-macosx	Tue Jan 15 18:57:42 2013 -0800
+++ b/src/share/lib/security/java.security-macosx	Fri Jan 18 22:01:17 2013 +0100
@@ -134,8 +134,7 @@
                com.sun.jmx.remote.util.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.glassfish.external.,\
-               com.sun.org.glassfish.gmbal.,\
+               com.sun.org.glassfish.,\
                apple.
 
 #
@@ -158,8 +157,7 @@
                    com.sun.jmx.remote.util.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.glassfish.external.,\
-                   com.sun.org.glassfish.gmbal.,\
+                   com.sun.org.glassfish.,\
                    apple.
 
 #
--- a/src/share/lib/security/java.security-solaris	Tue Jan 15 18:57:42 2013 -0800
+++ b/src/share/lib/security/java.security-solaris	Fri Jan 18 22:01:17 2013 +0100
@@ -135,8 +135,7 @@
                com.sun.jmx.remote.util.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.glassfish.external.,\
-               com.sun.org.glassfish.gmbal.
+               com.sun.org.glassfish.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -158,8 +157,7 @@
                    com.sun.jmx.remote.util.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.glassfish.external.,\
-                   com.sun.org.glassfish.gmbal.
+                   com.sun.org.glassfish.
 
 #
 # Determines whether this properties file can be appended to
--- a/src/share/lib/security/java.security-windows	Tue Jan 15 18:57:42 2013 -0800
+++ b/src/share/lib/security/java.security-windows	Fri Jan 18 22:01:17 2013 +0100
@@ -134,8 +134,7 @@
                com.sun.jmx.remote.util.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.glassfish.external.,\
-               com.sun.org.glassfish.gmbal.
+               com.sun.org.glassfish.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -157,8 +156,7 @@
                    com.sun.jmx.remote.util.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.glassfish.external.,\
-                   com.sun.org.glassfish.gmbal.
+                   com.sun.org.glassfish.
 
 #
 # Determines whether this properties file can be appended to
--- a/test/Makefile	Tue Jan 15 18:57:42 2013 -0800
+++ b/test/Makefile	Fri Jan 18 22:01:17 2013 +0100
@@ -512,7 +512,8 @@
 JDK_ALL_TARGETS += jdk_misc
 jdk_misc: $(call TestDirs, \
           demo/jvmti demo/zipfs javax/naming javax/script \
-          javax/smartcardio javax/xml/soap com/sun/jndi com/sun/xml sun/misc)
+          javax/smartcardio com/sun/jndi com/sun/org/glassfish com/sun/xml \
+          sun/misc)
 	$(call RunAgentvmBatch)
 
 # Stable samevm testruns (minus items from PROBLEM_LIST)