On second thought, according to the javadocs @ http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServletRequest.html#getPathInfo() .. this is probably more correct, and still better than what it was before.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=64726165
diff --git a/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java b/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java
index b09d283..5dcecbb 100644
--- a/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java
+++ b/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java
@@ -217,6 +217,8 @@
if (pathInfo.isEmpty() && servletPathLength > 0) {
pathInfo = null;
}
+ } else {
+ pathInfo = null; // we know nothing additional about the URI.
}
pathInfoComputed = true;
}
diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
index 91226fe..c1857e4 100644
--- a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
+++ b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
@@ -126,7 +126,7 @@
// see external issue 372
pathInfoWithServletStyleMatching("/path/some/path/of.jsp", "/path", "/thing/*",
- "/some/path/of.jsp", "/some/path/of.jsp");
+ null, "/some/path/of.jsp");
// *.xx style mapping
pathInfoWithServletStyleMatching("/path/thing.thing", "/path", "*.thing", null, "/thing.thing");
