SEC-64: Correct operation with Orion Web Application Server. Patch thanks to Paul Brooks.

This commit is contained in:
Ben Alex 2005-11-03 09:48:52 +00:00
parent d9be0f86fd
commit 0d77abb9c1

View File

@ -1,4 +1,4 @@
/* Copyright 2004 Acegi Technology Pty Limited /* Copyright 2004, 2005 Acegi Technology Pty Limited
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -114,8 +114,14 @@ public class FilterInvocation {
String pathInfo = getHttpRequest().getPathInfo(); String pathInfo = getHttpRequest().getPathInfo();
String queryString = getHttpRequest().getQueryString(); String queryString = getHttpRequest().getQueryString();
return getHttpRequest().getServletPath() String uri = getHttpRequest().getServletPath();
+ ((pathInfo == null) ? "" : pathInfo)
if (uri == null) {
uri = getHttpRequest().getRequestURI();
uri = uri.substring(getHttpRequest().getContextPath().length());
}
return uri + ((pathInfo == null) ? "" : pathInfo)
+ ((queryString == null) ? "" : ("?" + queryString)); + ((queryString == null) ? "" : ("?" + queryString));
} }