# HG changeset patch
# User michaelm
# Date 1246277433 -3600
# Node ID 0175bbf9a83392c498398ec11eb217aa0e915563
# Parent  4477a1762fa5ba0744643f04449e6ebac02678c3
6513803: httpserver regression test Test13 failing and causing NullPointerException
Summary: check for NPEs
Reviewed-by: chegar

diff -r 4477a1762fa5 -r 0175bbf9a833 jdk/test/com/sun/net/httpserver/Test1.java
--- a/jdk/test/com/sun/net/httpserver/Test1.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/jdk/test/com/sun/net/httpserver/Test1.java	Mon Jun 29 13:10:33 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 ();
         }
     }
 
diff -r 4477a1762fa5 -r 0175bbf9a833 jdk/test/com/sun/net/httpserver/Test12.java
--- a/jdk/test/com/sun/net/httpserver/Test12.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/jdk/test/com/sun/net/httpserver/Test12.java	Mon Jun 29 13:10:33 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 ();
         }
     }
 
diff -r 4477a1762fa5 -r 0175bbf9a833 jdk/test/com/sun/net/httpserver/Test13.java
--- a/jdk/test/com/sun/net/httpserver/Test13.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/jdk/test/com/sun/net/httpserver/Test13.java	Mon Jun 29 13:10:33 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 ();
         }
     }
 
diff -r 4477a1762fa5 -r 0175bbf9a833 jdk/test/com/sun/net/httpserver/Test3.java
--- a/jdk/test/com/sun/net/httpserver/Test3.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/jdk/test/com/sun/net/httpserver/Test3.java	Mon Jun 29 13:10:33 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();
         }
     }
 
diff -r 4477a1762fa5 -r 0175bbf9a833 jdk/test/com/sun/net/httpserver/Test4.java
--- a/jdk/test/com/sun/net/httpserver/Test4.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/jdk/test/com/sun/net/httpserver/Test4.java	Mon Jun 29 13:10:33 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();
         }
     }
 
diff -r 4477a1762fa5 -r 0175bbf9a833 jdk/test/com/sun/net/httpserver/Test5.java
--- a/jdk/test/com/sun/net/httpserver/Test5.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/jdk/test/com/sun/net/httpserver/Test5.java	Mon Jun 29 13:10:33 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();
         }
     }
 
diff -r 4477a1762fa5 -r 0175bbf9a833 jdk/test/com/sun/net/httpserver/Test9.java
--- a/jdk/test/com/sun/net/httpserver/Test9.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/jdk/test/com/sun/net/httpserver/Test9.java	Mon Jun 29 13:10:33 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 ();
         }
     }
 
diff -r 4477a1762fa5 -r 0175bbf9a833 jdk/test/com/sun/net/httpserver/Test9a.java
--- a/jdk/test/com/sun/net/httpserver/Test9a.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/jdk/test/com/sun/net/httpserver/Test9a.java	Mon Jun 29 13:10:33 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();
         }
     }
 
diff -r 4477a1762fa5 -r 0175bbf9a833 jdk/test/com/sun/net/httpserver/TestLogging.java
--- a/jdk/test/com/sun/net/httpserver/TestLogging.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/jdk/test/com/sun/net/httpserver/TestLogging.java	Mon Jun 29 13:10:33 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();
         }
     }
 }