OF-159: Defensively clean up, even in case of exceptions.

src/java/org/jivesoftware/util/S2STestService.java

 package org.jivesoftware.util;
 
 import java.security.cert.Certificate;
-import java.security.cert.CertificateParsingException;
 import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.HashMap;
@@ -85,26 +84,31 @@ public class S2STestService {
         InterceptorManager.getInstance().addInterceptor(interceptor);
 
         // Send ping.
-        Log.info("Sending server to server ping request to " +domain);
+        try
+        {
+            Log.info( "Sending server to server ping request to " + domain );
             sendPing();
 
             // Wait for success or exceed socket 5s timeout.
-        waitUntil.tryAcquire(6, TimeUnit.SECONDS);
+            waitUntil.tryAcquire( 6, TimeUnit.SECONDS );
 
             // Check on the connection status.
             logSessionStatus();
 
             // Prepare response.
-        results.put("certs", getCertificates());
-        results.put("stanzas", interceptor.toString());
-        results.put("logs", logs.toString());
-
-        // Cleanup
-        InterceptorManager.getInstance().removeInterceptor(interceptor);
-        Logger.getRootLogger().removeAppender(appender);
+            results.put( "certs", getCertificates() );
+            results.put( "stanzas", interceptor.toString() );
+            results.put( "logs", logs.toString() );
 
             return results;
         }
+        finally
+        {
+            // Cleanup
+            InterceptorManager.getInstance().removeInterceptor( interceptor );
+            Logger.getRootLogger().removeAppender( appender );
+        }
+    }
 
     /**
      * Begins intercepting logging.