Author: markt
Date: Fri Sep 17 14:11:03 2010
New Revision: 998145
URL: http://svn.apache.org/viewvc?rev=998145&view=rev
Log:
Remove more START/STOP actions and started attribute. They aren't adding
anything.
Modified:
tomcat/trunk/java/org/apache/coyote/ActionCode.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=998145&r1=998144&r2=998145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Fri Sep 17 14:11:03 2010
@@ -40,8 +40,6 @@ public enum ActionCode {
CUSTOM,
RESET,
- START,
- STOP,
WEBAPP,
/**
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=998145&r1=998144&r2=998145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Fri Sep 17
14:11:03 2010
@@ -176,12 +176,6 @@ public class AjpAprProcessor implements
/**
- * State flag.
- */
- protected boolean started = false;
-
-
- /**
* Error flag.
*/
protected boolean error = false;
@@ -378,7 +372,7 @@ public class AjpAprProcessor implements
boolean openSocket = true;
boolean keptAlive = false;
- while (started && !error && !endpoint.isPaused()) {
+ while (!error && !endpoint.isPaused()) {
// Parsing the request header
try {
@@ -593,14 +587,6 @@ public class AjpAprProcessor implements
error = true;
}
- } else if (actionCode == ActionCode.START) {
-
- started = true;
-
- } else if (actionCode == ActionCode.STOP) {
-
- started = false;
-
} else if (actionCode == ActionCode.REQ_SSL_ATTRIBUTE ) {
if (!certificates.isNull()) {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=998145&r1=998144&r2=998145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Fri Sep 17
14:11:03 2010
@@ -396,8 +396,6 @@ public class AjpAprProtocol
processor = createProcessor();
}
- processor.action(ActionCode.START, null);
-
if (processor.process(socket)) {
connections.put(Long.valueOf(socket), processor);
return SocketState.OPEN;
@@ -427,7 +425,6 @@ public class AjpAprProtocol
AjpAprProtocol.log.error
(sm.getString("ajpprotocol.proto.error"), e);
} finally {
- processor.action(ActionCode.STOP, null);
recycledProcessors.offer(processor);
}
return SocketState.CLOSED;
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=998145&r1=998144&r2=998145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Sep 17
14:11:03 2010
@@ -171,12 +171,6 @@ public class AjpProcessor implements Act
/**
- * State flag.
- */
- protected boolean started = false;
-
-
- /**
* Error flag.
*/
protected boolean error = false;
@@ -383,7 +377,7 @@ public class AjpProcessor implements Act
// Error flag
error = false;
- while (started && !error && !endpoint.isPaused()) {
+ while (!error && !endpoint.isPaused()) {
// Parsing the request header
try {
@@ -596,14 +590,6 @@ public class AjpProcessor implements Act
error = true;
}
- } else if (actionCode == ActionCode.START) {
-
- started = true;
-
- } else if (actionCode == ActionCode.STOP) {
-
- started = false;
-
} else if (actionCode == ActionCode.REQ_SSL_ATTRIBUTE ) {
if (!certificates.isNull()) {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=998145&r1=998144&r2=998145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Fri Sep 17
14:11:03 2010
@@ -391,7 +391,6 @@ public class AjpProtocol
if (processor == null) {
processor = createProcessor();
}
- processor.action(ActionCode.START, null);
SocketState state =
socket.isAsync()?processor.asyncDispatch(status):processor.process(socket);
if (state == SocketState.LONG) {
@@ -423,7 +422,6 @@ public class AjpProtocol
AjpProtocol.log.error
(sm.getString("ajpprotocol.proto.error"), e);
} finally {
- processor.action(ActionCode.STOP, null);
recycledProcessors.offer(processor);
}
return SocketState.CLOSED;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
