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
The following commit(s) were added to refs/heads/10.0.x by this push:
new 5561fd6 Fix copy/paste error
5561fd6 is described below
commit 5561fd6a1d8762eef7c3aedf2cd1f37856453fdc
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Feb 10 17:12:32 2022 +0000
Fix copy/paste error
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 6 +++---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 6 +++---
java/org/apache/tomcat/util/net/NioEndpoint.java | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index ea025f4..7e9f994 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -119,7 +119,7 @@ public class AprEndpoint extends
AbstractEndpoint<Long,Long> implements SNICallB
private int previousAcceptedPort = -1;
private String previousAcceptedAddress = null;
- private long previouspreviousAcceptedSocketNanoTime = 0;
+ private long previousAcceptedSocketNanoTime = 0;
// ------------------------------------------------------------ Constructor
@@ -818,14 +818,14 @@ public class AprEndpoint extends
AbstractEndpoint<Long,Long> implements SNICallB
long currentNanoTime = System.nanoTime();
if (wrapper.getRemotePort() == previousAcceptedPort) {
if
(wrapper.getRemoteAddr().equals(previousAcceptedAddress)) {
- if (currentNanoTime -
previouspreviousAcceptedSocketNanoTime < 1000) {
+ if (currentNanoTime - previousAcceptedSocketNanoTime <
1000) {
throw new
IOException(sm.getString("endpoint.err.duplicateAccept"));
}
}
}
previousAcceptedPort = wrapper.getRemotePort();
previousAcceptedAddress = wrapper.getRemoteAddr();
- previouspreviousAcceptedSocketNanoTime = currentNanoTime;
+ previousAcceptedSocketNanoTime = currentNanoTime;
}
connections.put(socket, wrapper);
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 23b9434..8ee9049 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -86,7 +86,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint<Nio2Channel,AsynchronousS
private SynchronizedStack<Nio2Channel> nioChannels;
private SocketAddress previousAcceptedSocketRemoteAddress = null;
- private long previouspreviousAcceptedSocketNanoTime = 0;
+ private long previousAcceptedSocketNanoTime = 0;
// --------------------------------------------------------- Public Methods
@@ -369,11 +369,11 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint<Nio2Channel,AsynchronousS
SocketAddress currentRemoteAddress = result.getRemoteAddress();
long currentNanoTime = System.nanoTime();
if
(currentRemoteAddress.equals(previousAcceptedSocketRemoteAddress) &&
- currentNanoTime - previouspreviousAcceptedSocketNanoTime <
1000) {
+ currentNanoTime - previousAcceptedSocketNanoTime < 1000) {
throw new
IOException(sm.getString("endpoint.err.duplicateAccept"));
}
previousAcceptedSocketRemoteAddress = currentRemoteAddress;
- previouspreviousAcceptedSocketNanoTime = currentNanoTime;
+ previousAcceptedSocketNanoTime = currentNanoTime;
}
return result;
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index f350d04..1b691a5 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -110,7 +110,7 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel,SocketChannel>
private SynchronizedStack<NioChannel> nioChannels;
private SocketAddress previousAcceptedSocketRemoteAddress = null;
- private long previouspreviousAcceptedSocketNanoTime = 0;
+ private long previousAcceptedSocketNanoTime = 0;
// ------------------------------------------------------------- Properties
@@ -523,11 +523,11 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel,SocketChannel>
SocketAddress currentRemoteAddress = result.getRemoteAddress();
long currentNanoTime = System.nanoTime();
if
(currentRemoteAddress.equals(previousAcceptedSocketRemoteAddress) &&
- currentNanoTime - previouspreviousAcceptedSocketNanoTime <
1000) {
+ currentNanoTime - previousAcceptedSocketNanoTime < 1000) {
throw new
IOException(sm.getString("endpoint.err.duplicateAccept"));
}
previousAcceptedSocketRemoteAddress = currentRemoteAddress;
- previouspreviousAcceptedSocketNanoTime = currentNanoTime;
+ previousAcceptedSocketNanoTime = currentNanoTime;
}
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
