You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/11/17 17:11:00 UTC
tomee git commit: TOMEE-1972 dont initialize system instance too
early - cli case
Repository: tomee
Updated Branches:
refs/heads/master a0bb33e78 -> 60b6b612a
TOMEE-1972 dont initialize system instance too early - cli case
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/60b6b612
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/60b6b612
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/60b6b612
Branch: refs/heads/master
Commit: 60b6b612a89edfac027b5423860d17a420951544
Parents: a0bb33e
Author: rmannibucau <rm...@apache.org>
Authored: Thu Nov 17 18:10:52 2016 +0100
Committer: rmannibucau <rm...@apache.org>
Committed: Thu Nov 17 18:10:52 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/loader/IO.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/60b6b612/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java
index 30e0769..1a5f477 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java
@@ -59,7 +59,9 @@ public class IO {
static {
int timeout = 5000;
try {
- timeout = SystemInstance.get().getOptions().get("openejb.io.util.timeout", timeout);
+ timeout = SystemInstance.isInitialized() ?
+ SystemInstance.get().getOptions().get("openejb.io.util.timeout", timeout) :
+ Integer.getInteger("openejb.io.util.timeout", timeout);
} catch (final Throwable th) {
// no-op: see ExecMojo
}