luetzkendorf 2004/10/08 07:53:44
Modified: src/share/org/apache/slide/search SlideUri.java
Log:
fix for special case if slide runs as servlet in a root application (merge)
Revision Changes Path
1.12 +7 -7 jakarta-slide/src/share/org/apache/slide/search/SlideUri.java
Index: SlideUri.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/SlideUri.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SlideUri.java 26 Sep 2004 14:54:55 -0000 1.11
+++ SlideUri.java 8 Oct 2004 14:53:44 -0000 1.12
@@ -47,9 +47,9 @@
* @return the created SlideUri
*/
public static SlideUri createWithRequestUri(String slideContextPath, String
requestUri) {
- if (slideContextPath.length() == 1) {
- // this.slideContextPath == "/"
- return new SlideUri(slideContextPath, requestUri);
+ if (slideContextPath.length() <= 1) {
+ // this.slideContextPath == "" or this.slideContextPath = "/"
+ return new SlideUri("/", requestUri);
} else {
return new SlideUri(slideContextPath,
requestUri.substring(slideContextPath.length()));
@@ -109,7 +109,7 @@
if (davPath.length() == this.context.length()) {
return "/";
}
- if (davPath.charAt(this.context.length()) != '/') {
+ if (this.context.length() > 1 && davPath.charAt(this.context.length())
!= '/') {
throw new InvalidScopeException (
"Uri \"" + davPath + "\" does not refer to " + context
+ ". If an absolute scope is used, it must start with \""
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
