You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/06/06 09:04:19 UTC
[tomcat] branch 10.0.x updated (adf6fad4ab -> e712347628)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from adf6fad4ab Fix typo
new 9642d0ac0f Polish. NioEndpoint
new e712347628 Replace the fixed message with endpoint.err.handshake
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/tomcat/util/net/NioEndpoint.java | 50 ++++++++++++------------
1 file changed, 25 insertions(+), 25 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Replace the fixed message with endpoint.err.handshake
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e7123476285ef6865c0074db0b9c4b695519d58a
Author: lihan <ao...@gmail.com>
AuthorDate: Fri Jun 3 22:57:19 2022 +0800
Replace the fixed message with endpoint.err.handshake
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index ce3445ed27..eb82a37c22 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1746,7 +1746,7 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
} catch (IOException x) {
handshake = -1;
if (log.isDebugEnabled()) {
- log.debug("Error during SSL handshake",x);
+ log.debug(sm.getString("endpoint.err.handshake"),x);
}
} catch (CancelledKeyException ckx) {
handshake = -1;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Polish. NioEndpoint
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9642d0ac0f208b883ad96e725103c96f983e652b
Author: lihan <ao...@gmail.com>
AuthorDate: Thu Jun 2 16:57:39 2022 +0800
Polish. NioEndpoint
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 48 ++++++++++++------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 05804c4f17..ce3445ed27 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -627,6 +627,19 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
}
}
+ private PollerEvent createPollerEvent(NioSocketWrapper socketWrapper, int interestOps) {
+ PollerEvent r = null;
+ if (eventCache != null) {
+ r = eventCache.pop();
+ }
+ if (r == null) {
+ r = new PollerEvent(socketWrapper, interestOps);
+ } else {
+ r.reset(socketWrapper, interestOps);
+ }
+ return r;
+ }
+
/**
* Add specified socket and associated pool to the poller. The socket will
* be added to a temporary array, and polled first after a maximum amount
@@ -638,16 +651,8 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
* the Poller
*/
public void add(NioSocketWrapper socketWrapper, int interestOps) {
- PollerEvent r = null;
- if (eventCache != null) {
- r = eventCache.pop();
- }
- if (r == null) {
- r = new PollerEvent(socketWrapper, interestOps);
- } else {
- r.reset(socketWrapper, interestOps);
- }
- addEvent(r);
+ PollerEvent pollerEvent = createPollerEvent(socketWrapper, interestOps);
+ addEvent(pollerEvent);
if (close) {
processSocket(socketWrapper, SocketEvent.STOP, false);
}
@@ -718,16 +723,8 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
*/
public void register(final NioSocketWrapper socketWrapper) {
socketWrapper.interestOps(SelectionKey.OP_READ);//this is what OP_REGISTER turns into.
- PollerEvent event = null;
- if (eventCache != null) {
- event = eventCache.pop();
- }
- if (event == null) {
- event = new PollerEvent(socketWrapper, OP_REGISTER);
- } else {
- event.reset(socketWrapper, OP_REGISTER);
- }
- addEvent(event);
+ PollerEvent pollerEvent = createPollerEvent(socketWrapper, OP_REGISTER);
+ addEvent(pollerEvent);
}
public void cancelledKey(SelectionKey sk, SocketWrapperBase<NioChannel> socketWrapper) {
@@ -1027,12 +1024,12 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
// Avoid duplicate stop calls
socketWrapper.interestOps(0);
cancelledKey(key, socketWrapper);
- } else if ((socketWrapper.interestOps() & SelectionKey.OP_READ) == SelectionKey.OP_READ ||
- (socketWrapper.interestOps() & SelectionKey.OP_WRITE) == SelectionKey.OP_WRITE) {
+ } else if (socketWrapper.interestOpsHas(SelectionKey.OP_READ) ||
+ socketWrapper.interestOpsHas(SelectionKey.OP_WRITE)) {
boolean readTimeout = false;
boolean writeTimeout = false;
// Check for read timeout
- if ((socketWrapper.interestOps() & SelectionKey.OP_READ) == SelectionKey.OP_READ) {
+ if (socketWrapper.interestOpsHas(SelectionKey.OP_READ)) {
long delta = now - socketWrapper.getLastRead();
long timeout = socketWrapper.getReadTimeout();
if (timeout > 0 && delta > timeout) {
@@ -1040,7 +1037,7 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
}
}
// Check for write timeout
- if (!readTimeout && (socketWrapper.interestOps() & SelectionKey.OP_WRITE) == SelectionKey.OP_WRITE) {
+ if (!readTimeout && socketWrapper.interestOpsHas(SelectionKey.OP_WRITE)) {
long delta = now - socketWrapper.getLastWrite();
long timeout = socketWrapper.getWriteTimeout();
if (timeout > 0 && delta > timeout) {
@@ -1125,6 +1122,9 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
public Poller getPoller() { return poller; }
public int interestOps() { return interestOps; }
public int interestOps(int ops) { this.interestOps = ops; return ops; }
+ public boolean interestOpsHas(int targetOp) {
+ return (this.interestOps() & targetOp) == targetOp;
+ }
public void setSendfileData(SendfileData sf) { this.sendfileData = sf;}
public SendfileData getSendfileData() { return this.sendfileData; }
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org