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/02/10 17:13:07 UTC
[tomcat] branch 9.0.x updated: Fix copy/paste error
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new e4b4054 Fix copy/paste error
e4b4054 is described below
commit e4b4054948c9770ff8263c5023514546e16d6335
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 10 17:12:58 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 6d0f10c..1b5f170 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -115,7 +115,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
@@ -814,14 +814,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 f82f738..49ee411 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;
// ------------------------------------------------------------- Properties
@@ -380,11 +380,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 196df26..3c7c8e6 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
@@ -550,11 +550,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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org