svn commit: r943208 - in /incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web: WebUtils.java mgt/CookieRememberMeManager.java

[lh...@apache.org]

Author: lhazlewood
Date: Tue May 11 17:52:38 2010
New Revision: 943208

URL: http://svn.apache.org/viewvc?rev=943208&view=rev
Log:
Ensured WebUtils used subjectContext.resolveServletRequest and resolveServletResponse where possible to perform more exhaustive lookup heuristics

Modified:
    incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java
    incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/mgt/CookieRememberMeManager.java

Modified: incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java?rev=943208&r1=943207&r2=943208&view=diff
==============================================================================
--- incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java (original)
+++ incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java Tue May 11 17:52:38 2010
@@ -250,8 +250,8 @@ public class WebUtils {
     public static boolean isHttp(SubjectContext context) {
         if (context instanceof WebSubjectContext) {
             WebSubjectContext wsc = (WebSubjectContext) context;
-            ServletRequest request = wsc.getServletRequest();
-            ServletResponse response = wsc.getServletResponse();
+            ServletRequest request = wsc.resolveServletRequest();
+            ServletResponse response = wsc.resolveServletResponse();
             return request != null && request instanceof HttpServletRequest &&
                     response != null && response instanceof HttpServletResponse;
         }
@@ -358,7 +358,7 @@ public class WebUtils {
             throw new IllegalArgumentException(msg);
         }
         WebSubjectContext wsc = (WebSubjectContext) context;
-        ServletRequest request = wsc.getServletRequest();
+        ServletRequest request = wsc.resolveServletRequest();
         if (request == null || !(request instanceof HttpServletRequest)) {
             String msg = "WebSubjectContext's ServletRequest is null or not an instance of HttpServletRequest.";
             throw new IllegalArgumentException(msg);
@@ -386,7 +386,7 @@ public class WebUtils {
             throw new IllegalArgumentException(msg);
         }
         WebSubjectContext wsc = (WebSubjectContext) context;
-        ServletResponse response = wsc.getServletResponse();
+        ServletResponse response = wsc.resolveServletResponse();
         if (response == null || !(response instanceof HttpServletResponse)) {
             String msg = "WebSubjectContext's ServletResponse is null or not an instance of HttpServletResponse.";
             throw new IllegalArgumentException(msg);

Modified: incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/mgt/CookieRememberMeManager.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/mgt/CookieRememberMeManager.java?rev=943208&r1=943207&r2=943208&view=diff
==============================================================================
--- incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/mgt/CookieRememberMeManager.java (original)
+++ incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/mgt/CookieRememberMeManager.java Tue May 11 17:52:38 2010
@@ -159,7 +159,7 @@ public class CookieRememberMeManager ext
     }
 
     private boolean isIdentityRemoved(WebSubjectContext subjectContext) {
-        ServletRequest request = subjectContext.getServletRequest();
+        ServletRequest request = subjectContext.resolveServletRequest();
         if (request != null) {
             Boolean removed = (Boolean) request.getAttribute(ShiroHttpServletRequest.IDENTITY_REMOVED_KEY);
             return removed != null && removed;