Fix unit test failure. Ignore exceptions when destroying APR connector if APR was...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@979865 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index c96edc1..2400ebf 100644 (file)
--- 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;
     }