Author: markt
Date: Mon Jan 21 20:32:53 2013
New Revision: 1436597
URL: http://svn.apache.org/viewvc?rev=1436597&view=rev
Log:
Refactor to avoid potential null warning
Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java?rev=1436597&r1=1436596&r2=1436597&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java Mon
Jan 21 20:32:53 2013
@@ -50,9 +50,12 @@ public class ResolverImpl extends Resolv
return request.getHeader("forwarded");
} else if (key.equals("HTTP_HOST")) {
String host = request.getHeader("host");
- int index = (host != null) ? host.indexOf(':') : -1;
- if (index != -1)
- host = host.substring(0, index);
+ if (host != null) {
+ int index = host.indexOf(':');
+ if (index != -1) {
+ host = host.substring(0, index);
+ }
+ }
return host;
} else if (key.equals("HTTP_PROXY_CONNECTION")) {
return request.getHeader("proxy-connection");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
