[tomcat] 01/02: Align with 10.0.x. No functional change.

[markt]

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

commit 87e686599bc1e034b0d7f393ef1b3ea701332a8b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 8 19:33:50 2020 +0100

    Align with 10.0.x. No functional change.
---
 java/org/apache/tomcat/buildutil/translate/Utils.java | 2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java 
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 5eb015f..63d3947 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -73,7 +73,7 @@ public class Utils {
         if (result.contains("[{0}]")) {
             result = FIX_SINGLE_QUOTE.matcher(result).replaceAll("''");
         }
-        return result;
+        return result.trim();
     }
 
 
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 9a8a0aa..7fa25e3 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -134,7 +134,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint<NioChannel,SocketChannel>
     public boolean getUseInheritedChannel() { return useInheritedChannel; }
 
     /**
-     * Priority of the poller threads.
+     * Priority of the poller thread.
      */
     private int pollerThreadPriority = Thread.NORM_PRIORITY;
     public void setPollerThreadPriority(int pollerThreadPriority) { 
this.pollerThreadPriority = pollerThreadPriority; }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org