Author: markt
Date: Wed Aug 19 09:06:16 2015
New Revision: 1696545
URL: http://svn.apache.org/r1696545
Log:
The instanceId field is never used in the coyote request
Modified:
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1696545&r1=1696544&r2=1696545&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Wed Aug 19 09:06:16 2015
@@ -97,8 +97,6 @@ public final class Request {
private final MimeHeaders headers = new MimeHeaders();
- private final MessageBytes instanceId = MessageBytes.newInstance();
-
/**
* Notes.
*/
@@ -179,18 +177,6 @@ public final class Request {
// ------------------------------------------------------------- Properties
- /**
- * Get the instance id (or JVM route). Currently Ajp is sending it with
each
- * request. In future this should be fixed, and sent only once ( or
- * 'negotiated' at config time so both tomcat and apache share the same
name.
- *
- * @return the instance id
- */
- public MessageBytes instanceId() {
- return instanceId;
- }
-
-
public MimeHeaders getMimeHeaders() {
return headers;
}
@@ -548,7 +534,6 @@ public final class Request {
schemeMB.recycle();
- instanceId.recycle();
remoteUser.recycle();
remoteUserNeedsAuthorization = false;
authType.recycle();
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1696545&r1=1696544&r2=1696545&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Aug 19
09:06:16 2015
@@ -1193,7 +1193,8 @@ public class AjpProcessor extends Abstra
break;
case Constants.SC_A_JVM_ROUTE :
- requestHeaderMessage.getBytes(request.instanceId());
+ requestHeaderMessage.getBytes(tmpMB);
+ // nothing
break;
case Constants.SC_A_SSL_CERT :
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
