Author: remy.maucherat(a)jboss.com
Date: 2009-10-28 11:08:23 -0400 (Wed, 28 Oct 2009)
New Revision: 1227
Modified:
trunk/java/org/apache/catalina/connector/Request.java
trunk/java/org/apache/catalina/core/StandardWrapper.java
Log:
- Add back two request mutators.
- Remove useless logging.
Modified: trunk/java/org/apache/catalina/connector/Request.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Request.java 2009-10-27 16:03:40 UTC (rev
1226)
+++ trunk/java/org/apache/catalina/connector/Request.java 2009-10-28 15:08:23 UTC (rev
1227)
@@ -56,7 +56,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
-import java.util.EventListener;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -969,7 +968,7 @@
* @param remoteAddr The remote IP address
*/
public void setRemoteAddr(String remoteAddr) {
- // Not used
+ this.remoteAddr = remoteAddr;
}
@@ -980,7 +979,7 @@
* @param remoteHost The remote host name
*/
public void setRemoteHost(String remoteHost) {
- // Not used
+ this.remoteHost = remoteHost;
}
Modified: trunk/java/org/apache/catalina/core/StandardWrapper.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardWrapper.java 2009-10-27 16:03:40 UTC (rev
1226)
+++ trunk/java/org/apache/catalina/core/StandardWrapper.java 2009-10-28 15:08:23 UTC (rev
1227)
@@ -989,9 +989,6 @@
synchronized (this) {
if (instance == null) {
try {
- if (log.isDebugEnabled())
- log.debug("Allocating non-STM instance");
-
instance = loadServlet();
} catch (ServletException e) {
throw e;
@@ -1004,8 +1001,6 @@
}
if (!singleThreadModel) {
- if (log.isTraceEnabled())
- log.trace(" Returning non-STM instance");
return (instance);
}
@@ -1033,8 +1028,6 @@
}
}
}
- if (log.isTraceEnabled())
- log.trace(" Returning allocated STM instance");
countAllocated++;
return (Servlet) instancePool.pop();
Show replies by date