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:34:47 UTC
svn commit: r1138753 -
/mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
Author: ngn
Date: Thu Jun 23 07:34:47 2011
New Revision: 1138753
URL: http://svn.apache.org/viewvc?rev=1138753&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/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
Modified: mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java?rev=1138753&r1=1138752&r2=1138753&view=diff
==============================================================================
--- mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java (original)
+++ mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java Thu Jun 23 07:34:47 2011
@@ -224,7 +224,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();