Merge

test/com/sun/net/httpserver/Test1.java

@@ -86,9 +86,12 @@ public class Test1 extends Test {
             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 ();
         }
     }
 

test/com/sun/net/httpserver/Test12.java

@@ -85,9 +85,12 @@ public class Test12 extends Test {
             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 ();
         }
     }
 

test/com/sun/net/httpserver/Test13.java

@@ -81,9 +81,12 @@ public class Test13 extends Test {
             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 ();
         }
     }
 

test/com/sun/net/httpserver/Test3.java

@@ -62,8 +62,10 @@ public class Test3 extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            server.stop(2);
-            exec.shutdown();
+            if (server != null)
+                server.stop(2);
+            if (exec != null)
+                exec.shutdown();
         }
     }
 

test/com/sun/net/httpserver/Test4.java

@@ -60,8 +60,10 @@ public class Test4 extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            server.stop(2);
-            exec.shutdown();
+            if (server != null)
+                server.stop(2);
+            if (exec != null)
+                exec.shutdown();
         }
     }
 

test/com/sun/net/httpserver/Test5.java

@@ -61,8 +61,10 @@ public class Test5 extends Test {
             System.out.println ("OK");
         } finally {
             delay ();
-            server.stop(2);
-            exec.shutdown();
+            if (server != null)
+                server.stop(2);
+            if (exec != null)
+                exec.shutdown();
         }
     }
 

test/com/sun/net/httpserver/Test9.java

@@ -97,9 +97,12 @@ public class Test9 extends Test {
             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 ();
         }
     }
 

test/com/sun/net/httpserver/Test9a.java

@@ -92,8 +92,10 @@ public class Test9a extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            server.stop(2);
-            executor.shutdown ();
+            if (server != null)
+                server.stop(2);
+            if (executor != null)
+                executor.shutdown();
         }
     }
 

test/com/sun/net/httpserver/TestLogging.java

@@ -89,8 +89,10 @@ public class TestLogging extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            s1.stop(2);
-            executor.shutdown ();
+            if (s1 != null)
+                s1.stop(2);
+            if (executor != null)
+                executor.shutdown();
         }
     }
 }