You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@mina.apache.org by ng...@apache.org on 2011/06/23 09:35:20 UTC

svn commit: r1138754 - /mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java

Author: ngn
Date: Thu Jun 23 07:35:20 2011
New Revision: 1138754

URL: http://svn.apache.org/viewvc?rev=1138754&view=rev
Log:
Working around a bug in the IBM JVM which might cause a NPE in test tear down (FTPSERVER-422)

Modified:
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java?rev=1138754&r1=1138753&r2=1138754&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java Thu Jun 23 07:35:20 2011
@@ -227,7 +227,12 @@ public abstract class ClientTestTemplate
         }
 
         if (server != null) {
-            server.stop();
+        	try {
+        		server.stop();
+        	} catch(NullPointerException e) {
+        		// a bug in the IBM JVM might cause Thread.interrupt() to throw an NPE
+        		// see http://www-01.ibm.com/support/docview.wss?uid=swg1IZ52037&wv=1
+        	}
         }
 
         cleanTmpDirs();