From 0d77abb9c1d21259e6de8c0ad543670cb35709e3 Mon Sep 17 00:00:00 2001 From: Ben Alex Date: Thu, 3 Nov 2005 09:48:52 +0000 Subject: [PATCH] SEC-64: Correct operation with Orion Web Application Server. Patch thanks to Paul Brooks. --- .../intercept/web/FilterInvocation.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocation.java b/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocation.java index 06caa9c82d..a5400923b6 100644 --- a/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocation.java +++ b/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocation.java @@ -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"); * you may not use this file except in compliance with the License. @@ -114,8 +114,14 @@ public class FilterInvocation { String pathInfo = getHttpRequest().getPathInfo(); String queryString = getHttpRequest().getQueryString(); - return getHttpRequest().getServletPath() - + ((pathInfo == null) ? "" : pathInfo) + String uri = getHttpRequest().getServletPath(); + + if (uri == null) { + uri = getHttpRequest().getRequestURI(); + uri = uri.substring(getHttpRequest().getContextPath().length()); + } + + return uri + ((pathInfo == null) ? "" : pathInfo) + ((queryString == null) ? "" : ("?" + queryString)); }