| commit | 309d7942df4ae24332d28929b5464f7ab8a2373a | [log] [tgz] |
|---|---|---|
| author | Niklas Gustavsson <ngn@apache.org> | Thu Jun 23 07:35:20 2011 +0000 |
| committer | Niklas Gustavsson <ngn@apache.org> | Thu Jun 23 07:35:20 2011 +0000 |
| tree | ffffa8deba23ab57cf50d0b51d74e5fb6b25df8b | |
| parent | 02765e5bcaaa55d94227dd35a37293889e6c0844 [diff] |
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
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 @@ } 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();