modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 11
+++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 9302f90bc0d81905bf62649666b7df0913acdac7
Author: Elias Ross <genman(a)noderunner.net>
Date: Wed Jan 29 17:02:42 2014 +0100
Bug 1053922 - Agent does not set HTTP connect or read timeout in JBoss remoting
diff --git
a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
index b6cd741..4d4beab 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2013 Red Hat, Inc.
+ * Copyright (C) 2005-2014 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -16,6 +16,7 @@
* along with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
+
package org.rhq.enterprise.agent;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -2738,6 +2739,14 @@ public class AgentMain {
config.put(HTTPSClientInvoker.IGNORE_HTTPS_HOST, "true");
}
+ // The JBoss remoting HTTP transport can wait indefinitely for a response
+ // This ensures the client does not wait forever
+ long clientSenderCommandTimeout =
m_configuration.getClientSenderCommandTimeout();
+ long timeout = clientSenderCommandTimeout;
+ if (timeout > 0) {
+ config.put("timeout", Long.toString(timeout));
+ }
+
RemoteCommunicator remote_comm = new JBossRemotingRemoteCommunicator(uri,
config);
if (withFailover) {
remote_comm.setFailureCallback(new FailoverFailureCallback(this));
Show replies by date