Author: pferraro
Date: 2009-05-18 14:12:56 -0400 (Mon, 18 May 2009)
New Revision: 2431
Modified:
trunk/mod_cluster/src/demo/java/org/jboss/modcluster/demo/servlet/ActiveSessionsLoadServlet.java
trunk/mod_cluster/src/demo/java/org/jboss/modcluster/demo/servlet/LoadServlet.java
Log:
Use local host from connector.
Modified:
trunk/mod_cluster/src/demo/java/org/jboss/modcluster/demo/servlet/ActiveSessionsLoadServlet.java
===================================================================
---
trunk/mod_cluster/src/demo/java/org/jboss/modcluster/demo/servlet/ActiveSessionsLoadServlet.java 2009-05-18
17:30:51 UTC (rev 2430)
+++
trunk/mod_cluster/src/demo/java/org/jboss/modcluster/demo/servlet/ActiveSessionsLoadServlet.java 2009-05-18
18:12:56 UTC (rev 2431)
@@ -69,7 +69,7 @@
for (int i = 0; i < count; ++i)
{
HttpClient client = new HttpClient();
- HttpMethod method = new HeadMethod(this.createLocalURL(request, null));
+ HttpMethod method = new HeadMethod(url);
client.executeMethod(method);
}
Modified:
trunk/mod_cluster/src/demo/java/org/jboss/modcluster/demo/servlet/LoadServlet.java
===================================================================
---
trunk/mod_cluster/src/demo/java/org/jboss/modcluster/demo/servlet/LoadServlet.java 2009-05-18
17:30:51 UTC (rev 2430)
+++
trunk/mod_cluster/src/demo/java/org/jboss/modcluster/demo/servlet/LoadServlet.java 2009-05-18
18:12:56 UTC (rev 2431)
@@ -26,6 +26,7 @@
import java.util.Map;
import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -48,6 +49,7 @@
protected static final String DEFAULT_DURATION = "15";
protected static final String COUNT = "count";
+ private static final String HOST = "host";
private static final String PORT = "port";
private static final String JVM_ROUTE = "jvmRoute";
@@ -64,7 +66,9 @@
{
if (connector.getProtocol().startsWith("HTTP"))
{
- config.getServletContext().setAttribute(PORT,
Integer.valueOf(connector.getPort()));
+ ServletContext context = config.getServletContext();
+ context.setAttribute(PORT, Integer.valueOf(connector.getPort()));
+ context.setAttribute(HOST, connector.getDomain());
}
}
@@ -79,8 +83,10 @@
protected String createLocalURL(HttpServletRequest request, Map<String, String>
parameterMap)
{
- Integer port = (Integer) this.getServletContext().getAttribute(PORT);
- return this.createURL(request, "localhost", (port != null) ?
port.intValue() : request.getLocalPort(), parameterMap);
+ ServletContext context = this.getServletContext();
+ String host = (String) context.getAttribute(HOST);
+ Integer port = (Integer) context.getAttribute(PORT);
+ return this.createURL(request, (host != null) ? host :
System.getProperty("jboss.bind.address", "localhost"), (port != null)
? port.intValue() : request.getLocalPort(), parameterMap);
}
private String createURL(HttpServletRequest request, String host, int port,
Map<String, String> parameterMap)
Show replies by date