From f2bb1961e2d5bb07c4ee6bc6d281f8b79fdf8ff9 Mon Sep 17 00:00:00 2001
From: msheppar <unknown>
Date: Fri, 6 Sep 2013 15:00:59 +0100
Subject: [PATCH] 8023326: [TESTBUG]
 java/net/CookieHandler/LocalHostCookie.java misplaced try/finally Summary:
 amended test to be more robust to set of potential exceptions thrown
 Reviewed-by: chegar, khazra

---
 test/java/net/CookieHandler/LocalHostCookie.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/java/net/CookieHandler/LocalHostCookie.java b/test/java/net/CookieHandler/LocalHostCookie.java
index ac8d61622..56db94712 100644
--- a/test/java/net/CookieHandler/LocalHostCookie.java
+++ b/test/java/net/CookieHandler/LocalHostCookie.java
@@ -72,7 +72,9 @@ public class LocalHostCookie {
                 }
             }
         } finally {
-            s.stopServer();
+            if (s != null) {
+                s.stopServer();
+            }
         }
     }
 
@@ -96,7 +98,9 @@ public class LocalHostCookie {
         }
 
         public void stopServer() {
-            server.stop(0);
+            if (server != null) {
+                server.stop(0);
+            }
         }
     }
 
-- 
GitLab