You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/10/23 15:26:26 UTC
git commit: Just close stream
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 0e8740fd2 -> c24b62731
Just close stream
Prevent NoClassDefFoundError: org/apache/openejb/loader/IO on shutdown
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c24b6273
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c24b6273
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c24b6273
Branch: refs/heads/tomee-1.7.x
Commit: c24b627317c0b677a09ac5e26a333f5dc7b60690
Parents: 0e8740f
Author: andygumbrecht <an...@apache.org>
Authored: Thu Oct 23 15:26:02 2014 +0200
Committer: andygumbrecht <an...@apache.org>
Committed: Thu Oct 23 15:26:02 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/openejb/config/RemoteServer.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c24b6273/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
index 5f65e5e..891833e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
@@ -18,7 +18,6 @@
package org.apache.openejb.config;
import org.apache.openejb.OpenEJBRuntimeException;
-import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.Options;
import org.apache.openejb.util.Join;
import org.apache.openejb.util.Pipe;
@@ -39,6 +38,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+//import org.apache.openejb.loader.IO;
+
/**
* NOTE: Do not add inner or anonymous classes or a dependency without updating ExecMojo
*
@@ -559,7 +560,13 @@ public class RemoteServer {
return false;
}
} finally {
- IO.close(stream);
+ if (null != stream) {
+ try {
+ stream.close();
+ } catch (final Exception e) {
+ // Ignore
+ }
+ }
if (socket != null) {
try {
socket.close();