stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6829636: test/java/util/logging/LoggingDeadlock2.java is flaky

Browse Source 
Remove @ignore

Reviewed-by: swamyv
This commit is contained in:
Mandy Chung 2009-05-26 17:47:57 -07:00
parent 74bfe722ce
commit e2f7248afb
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/src/share/classes/java/net/URLConnection.java
View File

@ -1237,7 +1237,6 @@ public abstract class URLConnection {
} }
private static Hashtable handlers = new Hashtable(); private static Hashtable handlers = new Hashtable();
private static final ContentHandler UnknownContentHandlerP = new UnknownContentHandler();
/** /**
* Gets the Content Handler appropriate for this connection. * Gets the Content Handler appropriate for this connection.
@ -1264,7 +1263,7 @@ public abstract class URLConnection {
handler = lookupContentHandlerClassFor(contentType); handler = lookupContentHandlerClassFor(contentType);
} catch(Exception e) { } catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
handler = UnknownContentHandlerP; handler = UnknownContentHandler.INSTANCE;
} }
handlers.put(contentType, handler); handlers.put(contentType, handler);
} }
@ -1335,7 +1334,7 @@ public abstract class URLConnection {
} }
} }
return UnknownContentHandlerP; return UnknownContentHandler.INSTANCE;
} }
/** /**
@ -1761,6 +1760,8 @@ public abstract class URLConnection {
class UnknownContentHandler extends ContentHandler { class UnknownContentHandler extends ContentHandler {
static final ContentHandler INSTANCE = new UnknownContentHandler();
public Object getContent(URLConnection uc) throws IOException { public Object getContent(URLConnection uc) throws IOException {
return uc.getInputStream(); return uc.getInputStream();
} }

19
jdk/test/Makefile
View File

@ -228,6 +228,25 @@ PHONY_LIST += packtest packtest_stress
################################################################ ################################################################
# 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 # vmsqe tests
# Expect JPRT to set JPRT_VMSQE_HOME. # Expect JPRT to set JPRT_VMSQE_HOME.

1
jdk/test/java/util/logging/LoggingDeadlock2.java
View File

@ -24,7 +24,6 @@
/* /*
* @test * @test
* @bug 6467152 6716076 6829503 * @bug 6467152 6716076 6829503
* @ignore Until made more stable, see 6829636.
* @summary deadlock occurs in LogManager initialization and JVM termination * @summary deadlock occurs in LogManager initialization and JVM termination
* @author Serguei Spitsyn / Hitachi / Martin Buchholz * @author Serguei Spitsyn / Hitachi / Martin Buchholz
* *