From 4a303664241f6dab6fac9cdb1fa5784716ca58a6 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 27 Jul 2010 20:56:10 +0000
Subject: [PATCH] Fix unit test failure. Ignore exceptions when destroying APR
 connector if APR was never initialised.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@979865 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index c96edc17d..2400ebfd5 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -700,14 +700,26 @@ public class AprEndpoint extends AbstractEndpoint {
         if (running) {
             stop();
         }
-        Pool.destroy(serverSockPool);
+        try {
+            Pool.destroy(serverSockPool);
+        } catch (UnsatisfiedLinkError e) {
+            // Ignore - APR was not initialised
+        }
         serverSockPool = 0;
         // Close server socket
-        Socket.close(serverSock);
+        try {
+            Socket.close(serverSock);
+        } catch (UnsatisfiedLinkError e) {
+            // Ignore - APR was not initialised
+        }
         serverSock = 0;
         sslContext = 0;
         // Close all APR memory pools and resources
-        Pool.destroy(rootPool);
+        try {
+            Pool.destroy(rootPool);
+        } catch (UnsatisfiedLinkError e) {
+            // Ignore - APR was not initialised
+        }
         rootPool = 0;
         initialized = false;
     }
-- 
2.11.0