Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authormichaelm
Mon, 29 Jun 2009 13:29:05 +0100
changeset 3071 4c41936173e7
parent 3068 f024ac2a48d1 (current diff)
parent 3070 0175bbf9a833 (diff)
child 3072 a801b122142f
Merge
--- a/jdk/test/com/sun/net/httpserver/Test1.java	Sun Jun 28 11:47:34 2009 -0700
+++ b/jdk/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/jdk/test/com/sun/net/httpserver/Test12.java	Sun Jun 28 11:47:34 2009 -0700
+++ b/jdk/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/jdk/test/com/sun/net/httpserver/Test13.java	Sun Jun 28 11:47:34 2009 -0700
+++ b/jdk/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/jdk/test/com/sun/net/httpserver/Test3.java	Sun Jun 28 11:47:34 2009 -0700
+++ b/jdk/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/jdk/test/com/sun/net/httpserver/Test4.java	Sun Jun 28 11:47:34 2009 -0700
+++ b/jdk/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/jdk/test/com/sun/net/httpserver/Test5.java	Sun Jun 28 11:47:34 2009 -0700
+++ b/jdk/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/jdk/test/com/sun/net/httpserver/Test9.java	Sun Jun 28 11:47:34 2009 -0700
+++ b/jdk/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/jdk/test/com/sun/net/httpserver/Test9a.java	Sun Jun 28 11:47:34 2009 -0700
+++ b/jdk/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/jdk/test/com/sun/net/httpserver/TestLogging.java	Sun Jun 28 11:47:34 2009 -0700
+++ b/jdk/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();
         }
     }
 }
jdk-sandbox