Author: fhanik
Date: Thu Mar 25 19:32:46 2010
New Revision: 927555
URL: http://svn.apache.org/viewvc?rev=927555&view=rev
Log:
Clean up. The setAsync can be done in a single bottleneck, instead mixed into
the processor
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=927555&r1=927554&r2=927555&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Mar 25
19:32:46 2010
@@ -1558,7 +1558,6 @@ public class Request
}
public AsyncContext getAsyncContext() {
- // TODO SERVLET3 - async
return this.asyncContext;
}
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=927555&r1=927554&r2=927555&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Mar 25
19:32:46 2010
@@ -482,7 +482,6 @@ public class AjpProcessor implements Act
}
if (async && !error) {
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
- socket.setAsync(true);
return SocketState.LONG;
} else {
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
@@ -513,7 +512,6 @@ public class AjpProcessor implements Act
if (async) {
if (error) {
- socket.setAsync(false);
response.setStatus(500);
request.updateCounters();
recycle();
@@ -524,7 +522,6 @@ public class AjpProcessor implements Act
return SocketState.LONG;
}
} else {
- socket.setAsync(false);
if (error) {
response.setStatus(500);
}
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=927555&r1=927554&r2=927555&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Thu Mar 25
19:32:46 2010
@@ -385,8 +385,10 @@ public class AjpProtocol
SocketState state =
socket.isAsync()?processor.asyncDispatch(status):processor.process(socket);
if (state == SocketState.LONG) {
connections.put(socket, processor);
+ socket.setAsync(true);
} else {
connections.remove(socket);
+ socket.setAsync(false);
}
return state;
} catch(java.net.SocketException e) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=927555&r1=927554&r2=927555&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Mar 25
19:32:46 2010
@@ -323,11 +323,9 @@ public class Http11Processor extends Abs
recycle();
return SocketState.CLOSED;
} else {
- socket.setAsync(true);
return SocketState.LONG;
}
} else {
- socket.setAsync(false);
if ( error || (!keepAlive)) {
recycle();
return SocketState.CLOSED;
@@ -357,14 +355,12 @@ public class Http11Processor extends Abs
if (async) {
if (error) {
- socket.setAsync(false);
recycle();
return SocketState.CLOSED;
} else {
return SocketState.LONG;
}
} else {
- socket.setAsync(false);
if ( error || (!keepAlive)) {
recycle();
return SocketState.CLOSED;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=927555&r1=927554&r2=927555&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Thu Mar 25
19:32:46 2010
@@ -261,8 +261,10 @@ public class Http11Protocol extends Abst
SocketState state =
socket.isAsync()?processor.asyncDispatch(status):processor.process(socket);
if (state == SocketState.LONG) {
connections.put(socket, processor);
+ socket.setAsync(true);
} else {
connections.remove(socket);
+ socket.setAsync(false);
}
return state;
} catch(java.net.SocketException e) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=927555&r1=927554&r2=927555&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Mar
25 19:32:46 2010
@@ -146,12 +146,12 @@ public abstract class AbstractEndpoint {
return socketProperties;
}
-
-
-
// -----------------------------------------------------------------
Properties
+ private int maxConnections = 10000;
+ public void setMaxConnections(int maxCon) { this.maxConnections = maxCon; }
+ public int getMaxConnections() { return this.maxConnections; }
/**
* External Executor based thread pool.
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=927555&r1=927554&r2=927555&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Thu Mar 25
19:32:46 2010
@@ -512,12 +512,4 @@ public class JIoEndpoint extends Abstrac
protected ConcurrentLinkedQueue<SocketWrapper> waitingRequests = new
ConcurrentLinkedQueue<SocketWrapper>();
- protected class RequestProcessor implements Runnable {
-
- @Override
- public void run() {
-
- }
-
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
