From b789f68aad404483fef9bfe83901928c1ea231f1 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Mon, 12 Sep 2011 14:36:27 +0000 Subject: QPID-3449: adds ability to override the session timeout via JVM properties qpid.sync_op_timeout and the legacy amqj.default_syncwrite_timeout, across all protocol versions Applied patch by Oleksandr Rudyy and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1169773 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/configuration/ClientProperties.java | 12 +++++++++++- .../src/main/java/org/apache/qpid/transport/Session.java | 8 +++++--- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'qpid/java/common/src/main') diff --git a/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java index 36f9a1ae2d..62ded5b2d8 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java @@ -90,7 +90,17 @@ public class ClientProperties public static final String QPID_VERIFY_CLIENT_ID = "qpid.verify_client_id"; - private static ClientProperties _instance = new ClientProperties(); + /** + * System properties to change the default timeout used during + * synchronous operations. + */ + public static final String QPID_SYNC_OP_TIMEOUT = "qpid.sync_op_timeout"; + public static final String AMQJ_DEFAULT_SYNCWRITE_TIMEOUT = "amqj.default_syncwrite_timeout"; + + /** + * A default timeout value for synchronous operations + */ + public static final int DEFAULT_SYNC_OPERATION_TIMEOUT = 60000; /* public static final QpidProperty IGNORE_SET_CLIENTID_PROP_NAME = diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java index 4c996e261c..a838257fb6 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java @@ -30,6 +30,8 @@ import static org.apache.qpid.transport.Session.State.DETACHED; import static org.apache.qpid.transport.Session.State.NEW; import static org.apache.qpid.transport.Session.State.OPEN; import static org.apache.qpid.transport.Session.State.RESUMING; + +import org.apache.qpid.configuration.ClientProperties; import org.apache.qpid.transport.network.Frame; import static org.apache.qpid.transport.util.Functions.mod; import org.apache.qpid.transport.util.Logger; @@ -42,7 +44,6 @@ import static org.apache.qpid.util.Serial.max; import static org.apache.qpid.util.Strings.toUTF8; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -58,7 +59,6 @@ import java.util.concurrent.TimeUnit; public class Session extends SessionInvoker { - private static final Logger log = Logger.get(Session.class); public enum State { NEW, DETACHED, RESUMING, OPEN, CLOSING, CLOSED } @@ -92,7 +92,9 @@ public class Session extends SessionInvoker private int channel; private SessionDelegate delegate; private SessionListener listener = new DefaultSessionListener(); - private long timeout = 60000; + private final long timeout = Long.getLong(ClientProperties.QPID_SYNC_OP_TIMEOUT, + Long.getLong(ClientProperties.AMQJ_DEFAULT_SYNCWRITE_TIMEOUT, + ClientProperties.DEFAULT_SYNC_OPERATION_TIMEOUT)); private boolean autoSync = false; private boolean incomingInit; -- cgit v1.2.1