--- 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();
         }
     }
 }