Mercurial > hg > openjdk > jdk7 > jdk
changeset 1327:b6721df9ae0a
Merge
author | michaelm |
---|---|
date | Mon, 29 Jun 2009 13:29:05 +0100 |
parents | cbb5964d97ef (current diff) 806c5e4d1265 (diff) |
children | a44009aba19f |
files | |
diffstat | 9 files changed, 44 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/test/com/sun/net/httpserver/Test1.java Sun Jun 28 11:47:34 2009 -0700 +++ b/test/com/sun/net/httpserver/Test1.java Mon Jun 29 13:29:05 2009 +0100 @@ -86,9 +86,12 @@ System.out.println ("OK"); } finally { delay(); - s1.stop(2); - s2.stop(2); - executor.shutdown (); + if (s1 != null) + s1.stop(2); + if (s2 != null) + s2.stop(2); + if (executor != null) + executor.shutdown (); } }
--- a/test/com/sun/net/httpserver/Test12.java Sun Jun 28 11:47:34 2009 -0700 +++ b/test/com/sun/net/httpserver/Test12.java Mon Jun 29 13:29:05 2009 +0100 @@ -85,9 +85,12 @@ System.out.println ("OK"); } finally { delay(); - s1.stop(2); - s2.stop(2); - executor.shutdown (); + if (s1 != null) + s1.stop(2); + if (s2 != null) + s2.stop(2); + if (executor != null) + executor.shutdown (); } }
--- a/test/com/sun/net/httpserver/Test13.java Sun Jun 28 11:47:34 2009 -0700 +++ b/test/com/sun/net/httpserver/Test13.java Mon Jun 29 13:29:05 2009 +0100 @@ -81,9 +81,12 @@ System.out.println ("OK"); } finally { delay(); - s1.stop(2); - s2.stop(2); - executor.shutdown (); + if (s1 != null) + s1.stop(2); + if (s2 != null) + s2.stop(2); + if (executor != null) + executor.shutdown (); } }
--- a/test/com/sun/net/httpserver/Test3.java Sun Jun 28 11:47:34 2009 -0700 +++ b/test/com/sun/net/httpserver/Test3.java Mon Jun 29 13:29:05 2009 +0100 @@ -62,8 +62,10 @@ System.out.println ("OK"); } finally { delay(); - server.stop(2); - exec.shutdown(); + if (server != null) + server.stop(2); + if (exec != null) + exec.shutdown(); } }
--- a/test/com/sun/net/httpserver/Test4.java Sun Jun 28 11:47:34 2009 -0700 +++ b/test/com/sun/net/httpserver/Test4.java Mon Jun 29 13:29:05 2009 +0100 @@ -60,8 +60,10 @@ System.out.println ("OK"); } finally { delay(); - server.stop(2); - exec.shutdown(); + if (server != null) + server.stop(2); + if (exec != null) + exec.shutdown(); } }
--- a/test/com/sun/net/httpserver/Test5.java Sun Jun 28 11:47:34 2009 -0700 +++ b/test/com/sun/net/httpserver/Test5.java Mon Jun 29 13:29:05 2009 +0100 @@ -61,8 +61,10 @@ System.out.println ("OK"); } finally { delay (); - server.stop(2); - exec.shutdown(); + if (server != null) + server.stop(2); + if (exec != null) + exec.shutdown(); } }
--- a/test/com/sun/net/httpserver/Test9.java Sun Jun 28 11:47:34 2009 -0700 +++ b/test/com/sun/net/httpserver/Test9.java Mon Jun 29 13:29:05 2009 +0100 @@ -97,9 +97,12 @@ System.out.println ("OK"); } finally { delay(); - s1.stop(2); - s2.stop(2); - executor.shutdown (); + if (s1 != null) + s1.stop(2); + if (s2 != null) + s2.stop(2); + if (executor != null) + executor.shutdown (); } }
--- a/test/com/sun/net/httpserver/Test9a.java Sun Jun 28 11:47:34 2009 -0700 +++ b/test/com/sun/net/httpserver/Test9a.java Mon Jun 29 13:29:05 2009 +0100 @@ -92,8 +92,10 @@ System.out.println ("OK"); } finally { delay(); - server.stop(2); - executor.shutdown (); + if (server != null) + server.stop(2); + if (executor != null) + executor.shutdown(); } }
--- a/test/com/sun/net/httpserver/TestLogging.java Sun Jun 28 11:47:34 2009 -0700 +++ b/test/com/sun/net/httpserver/TestLogging.java Mon Jun 29 13:29:05 2009 +0100 @@ -89,8 +89,10 @@ System.out.println ("OK"); } finally { delay(); - s1.stop(2); - executor.shutdown (); + if (s1 != null) + s1.stop(2); + if (executor != null) + executor.shutdown(); } } }