--- a/jdk/src/share/classes/java/net/URLConnection.java	Tue May 26 16:03:51 2009 +0200
+++ b/jdk/src/share/classes/java/net/URLConnection.java	Tue May 26 17:47:57 2009 -0700
@@ -1237,7 +1237,6 @@
     }
 
     private static Hashtable handlers = new Hashtable();
-    private static final ContentHandler UnknownContentHandlerP = new UnknownContentHandler();
 
     /**
      * Gets the Content Handler appropriate for this connection.
@@ -1264,7 +1263,7 @@
                 handler = lookupContentHandlerClassFor(contentType);
             } catch(Exception e) {
                 e.printStackTrace();
-                handler = UnknownContentHandlerP;
+                handler = UnknownContentHandler.INSTANCE;
             }
             handlers.put(contentType, handler);
         }
@@ -1335,7 +1334,7 @@
             }
         }
 
-        return UnknownContentHandlerP;
+        return UnknownContentHandler.INSTANCE;
     }
 
     /**
@@ -1761,6 +1760,8 @@
 
 
 class UnknownContentHandler extends ContentHandler {
+    static final ContentHandler INSTANCE = new UnknownContentHandler();
+
     public Object getContent(URLConnection uc) throws IOException {
         return uc.getInputStream();
     }

--- a/jdk/test/Makefile	Tue May 26 16:03:51 2009 +0200
+++ b/jdk/test/Makefile	Tue May 26 17:47:57 2009 -0700
@@ -228,6 +228,25 @@
 
 ################################################################
 
+# perftest to collect statistics  
+
+# Expect JPRT to set JPRT_PACKTEST_HOME.
+PERFTEST_HOME = ${TEST_ROOT}/perf
+ifdef JPRT_PERFTEST_HOME
+  PERFTEST_HOME = $(JPRT_PERFTEST_HOME)
+endif
+
+perftest: ( $(PERFTEST_HOME)/perftest          \
+                 -t $(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)")               \
+                 -w $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)") \
+                 -h $(PERFTEST_HOME) \
+	 ) ; $(BUNDLE_UP_AND_EXIT)
+
+
+PHONY_LIST += perftest
+
+################################################################
+
 # vmsqe tests
 
 # Expect JPRT to set JPRT_VMSQE_HOME.

--- a/jdk/test/java/util/logging/LoggingDeadlock2.java	Tue May 26 16:03:51 2009 +0200
+++ b/jdk/test/java/util/logging/LoggingDeadlock2.java	Tue May 26 17:47:57 2009 -0700
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug     6467152 6716076 6829503
- * @ignore Until made more stable, see 6829636.
  * @summary deadlock occurs in LogManager initialization and JVM termination
  * @author  Serguei Spitsyn / Hitachi / Martin Buchholz
  *