Author: remy.maucherat(a)jboss.com
Date: 2010-01-15 07:44:23 -0500 (Fri, 15 Jan 2010)
New Revision: 1359
Modified:
trunk/java/org/jboss/web/rewrite/TomcatResolver.java
trunk/webapps/docs/changelog.xml
Log:
- Fix NPE with HTTP/1.0.
Modified: trunk/java/org/jboss/web/rewrite/TomcatResolver.java
===================================================================
--- trunk/java/org/jboss/web/rewrite/TomcatResolver.java 2010-01-15 00:03:28 UTC (rev
1358)
+++ trunk/java/org/jboss/web/rewrite/TomcatResolver.java 2010-01-15 12:44:23 UTC (rev
1359)
@@ -56,7 +56,7 @@
return request.getHeader("forwarded");
} else if (key.equals("HTTP_HOST")) {
String host = request.getHeader("host");
- int index = host.indexOf(':');
+ int index = (host != null) ? host.indexOf(':') : -1;
if (index != -1)
host = host.substring(0, index);
return host;
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2010-01-15 00:03:28 UTC (rev 1358)
+++ trunk/webapps/docs/changelog.xml 2010-01-15 12:44:23 UTC (rev 1359)
@@ -22,6 +22,9 @@
<fix>
<bug>48516</bug>: Possible NPE in JNDI realm. (markt)
</fix>
+ <fix>
+ <jira>157</jira>: NPE on host with HTTP/1.0, submitted by Markus
Grieder. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
Show replies by date