This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new f421dab Cosmetic changes only to align with 8.5.x to ease maintenance
f421dab is described below
commit f421dab423d86a0336fdc83b784cb485fd19f6cb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 20 15:45:47 2020 +0100
Cosmetic changes only to align with 8.5.x to ease maintenance
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 53 ++++++++++++------------
1 file changed, 26 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index a27ee22..432d89a 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1698,15 +1698,15 @@ public class AprEndpoint extends AbstractEndpoint<Long>
{
*/
@Override
public String toString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append("Poller");
long[] res = new long[pollerSize * 2];
int count = Poll.pollset(aprPoller, res);
buf.append(" [ ");
for (int j = 0; j < count; j++) {
- buf.append(desc[2*j+1]).append(" ");
+ buf.append(desc[2*j+1]).append(' ');
}
- buf.append("]");
+ buf.append(']');
return buf.toString();
}
@@ -1810,33 +1810,32 @@ public class AprEndpoint extends AbstractEndpoint<Long>
{
timeouts.remove(info.socket);
AprSocketWrapper wrapper = connections.get(
Long.valueOf(info.socket));
- if (wrapper == null) {
- continue;
- }
- if (info.read() || info.write()) {
- boolean comet = wrapper.isComet();
- if (comet || wrapper.pollerFlags != 0) {
- removeFromPoller(info.socket);
- }
- wrapper.pollerFlags = wrapper.pollerFlags |
- (info.read() ? Poll.APR_POLLIN : 0) |
- (info.write() ? Poll.APR_POLLOUT : 0);
- if (!addToPoller(info.socket,
wrapper.pollerFlags)) {
- // Can't do anything: close the socket
right
- // away
- if (!comet || !processSocket(info.socket,
SocketStatus.ERROR)) {
- closeSocket(info.socket);
+ if (wrapper != null) {
+ if (info.read() || info.write()) {
+ boolean comet = wrapper.isComet();
+ if (comet || wrapper.pollerFlags != 0) {
+ removeFromPoller(info.socket);
+ }
+ wrapper.pollerFlags = wrapper.pollerFlags |
+ (info.read() ? Poll.APR_POLLIN :
0) |
+ (info.write() ? Poll.APR_POLLOUT :
0);
+ if (!addToPoller(info.socket,
wrapper.pollerFlags)) {
+ // Can't do anything: close the socket
right
+ // away
+ if (!comet ||
!processSocket(info.socket, SocketStatus.ERROR)) {
+ closeSocket(info.socket);
+ }
+ } else {
+ timeouts.add(info.socket,
+ System.currentTimeMillis() +
+ info.timeout);
}
} else {
- timeouts.add(info.socket,
- System.currentTimeMillis() +
- info.timeout);
+ // Should never happen.
+ closeSocket(info.socket);
+ getLog().warn(sm.getString(
+ "endpoint.apr.pollAddInvalid",
info));
}
- } else {
- // Should never happen.
- closeSocket(info.socket);
- getLog().warn(sm.getString(
- "endpoint.apr.pollAddInvalid", info));
}
info = localAddList.get();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
