Author: kkolinko
Date: Thu Jan 7 13:55:25 2016
New Revision: 1723545
URL: http://svn.apache.org/viewvc?rev=1723545&view=rev
Log:
Extract common code from Protocol.getName() methods. No functional change.
This is in preparation for the fix for BZ 52028 (support for port number 0).
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1723545&r1=1723544&r2=1723545&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Jan
7 13:55:25 2016
@@ -16,6 +16,9 @@
*/
package org.apache.coyote;
+import java.net.InetAddress;
+import java.net.URLEncoder;
+
import org.apache.tomcat.util.net.AbstractEndpoint;
public abstract class AbstractProtocol implements ProtocolHandler {
@@ -28,4 +31,21 @@ public abstract class AbstractProtocol i
public void setMaxHeaderCount(int maxHeaderCount) {
getEndpoint().setMaxHeaderCount(maxHeaderCount);
}
+
+ /**
+ * An utility method, used to implement getName() in subclasses.
+ */
+ protected String createName(String prefix, InetAddress address, int port) {
+ StringBuilder name = new StringBuilder(prefix);
+ name.append('-');
+ if (address != null) {
+ String strAddr = address.toString();
+ if (strAddr.startsWith("/")) {
+ strAddr = strAddr.substring(1);
+ }
+ name.append(URLEncoder.encode(strAddr)).append('-');
+ }
+ name.append(port);
+ return name.toString();
+ }
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1723545&r1=1723544&r2=1723545&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Thu Jan
7 13:55:25 2016
@@ -232,14 +232,7 @@ public class AjpAprProtocol extends Abst
// *
public String getName() {
- String encodedAddr = "";
- if (getAddress() != null) {
- encodedAddr = "" + getAddress();
- if (encodedAddr.startsWith("/"))
- encodedAddr = encodedAddr.substring(1);
- encodedAddr = URLEncoder.encode(encodedAddr) + "-";
- }
- return ("ajp-" + encodedAddr + endpoint.getPort());
+ return createName("ajp", getAddress(), endpoint.getPort());
}
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1723545&r1=1723544&r2=1723545&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Thu Jan 7
13:55:25 2016
@@ -231,14 +231,7 @@ public class AjpProtocol extends Abstrac
// *
public String getName() {
- String encodedAddr = "";
- if (getAddress() != null) {
- encodedAddr = "" + getAddress();
- if (encodedAddr.startsWith("/"))
- encodedAddr = encodedAddr.substring(1);
- encodedAddr = URLEncoder.encode(encodedAddr) + "-";
- }
- return ("ajp-" + encodedAddr + endpoint.getPort());
+ return createName("ajp", getAddress(), endpoint.getPort());
}
/**
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1723545&r1=1723544&r2=1723545&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Thu Jan 7 13:55:25 2016
@@ -178,14 +178,7 @@ public class Http11AprProtocol extends A
}
public String getName() {
- String encodedAddr = "";
- if (getAddress() != null) {
- encodedAddr = "" + getAddress();
- if (encodedAddr.startsWith("/"))
- encodedAddr = encodedAddr.substring(1);
- encodedAddr = URLEncoder.encode(encodedAddr) + "-";
- }
- return ("http-" + encodedAddr + endpoint.getPort());
+ return createName("http", getAddress(), endpoint.getPort());
}
protected AprEndpoint endpoint=new AprEndpoint();
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1723545&r1=1723544&r2=1723545&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Thu Jan 7 13:55:25 2016
@@ -346,14 +346,7 @@ public class Http11NioProtocol extends A
}
public String getName() {
- String encodedAddr = "";
- if (getAddress() != null) {
- encodedAddr = "" + getAddress();
- if (encodedAddr.startsWith("/"))
- encodedAddr = encodedAddr.substring(1);
- encodedAddr = URLEncoder.encode(encodedAddr) + "-";
- }
- return ("http-" + encodedAddr + ep.getPort());
+ return createName("http", getAddress(), ep.getPort());
}
public boolean getTcpNoDelay() {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1723545&r1=1723544&r2=1723545&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java Thu
Jan 7 13:55:25 2016
@@ -19,7 +19,6 @@ package org.apache.coyote.http11;
import java.net.InetAddress;
import java.net.Socket;
-import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Iterator;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -248,14 +247,7 @@ public class Http11Protocol extends Abst
}
public String getName() {
- String encodedAddr = "";
- if (getAddress() != null) {
- encodedAddr = "" + getAddress();
- if (encodedAddr.startsWith("/"))
- encodedAddr = encodedAddr.substring(1);
- encodedAddr = URLEncoder.encode(encodedAddr) + "-";
- }
- return ("http-" + encodedAddr + endpoint.getPort());
+ return createName("http", getAddress(), endpoint.getPort());
}
// ------------------------------------------------------------- Properties
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
