This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 17c3094a45bab53b2267d8ed137c6c3750c7fc6c Author: remm <r...@apache.org> AuthorDate: Wed Dec 4 15:00:59 2019 +0100 Fix merge --- java/org/apache/tomcat/util/net/SocketWrapperBase.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java b/java/org/apache/tomcat/util/net/SocketWrapperBase.java index d1127ed..adeba23 100644 --- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java +++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java @@ -28,6 +28,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org