Working around a bug in the IBM JVM which might cause a NPE in test tear down (FTPSERVER-422)
git-svn-id: https://svn.apache.org/repos/asf/mina/ftpserver/trunk@1138754 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/commit/d9528ddf Tree: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/tree/d9528ddf Diff: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/diff/d9528ddf Branch: refs/heads/trunk Commit: d9528ddff8c77010a6a8da5d5876db0407c37176 Parents: 4648493 Author: Niklas Gustavsson <[email protected]> Authored: Thu Jun 23 07:35:20 2011 +0000 Committer: Niklas Gustavsson <[email protected]> Committed: Thu Jun 23 07:35:20 2011 +0000 ---------------------------------------------------------------------- .../org/apache/ftpserver/clienttests/ClientTestTemplate.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/d9528ddf/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java b/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java index 6ec9608..aad9d52 100644 --- a/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java +++ b/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java @@ -227,7 +227,12 @@ public abstract class ClientTestTemplate extends TestCase { } 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();
