svn commit: r788089 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java

[knopp]

Author: knopp
Date: Wed Jun 24 17:22:59 2009
New Revision: 788089

URL: http://svn.apache.org/viewvc?rev=788089&view=rev
Log: (empty)

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java?rev=788089&r1=788088&r2=788089&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java
 Wed Jun 24 17:22:59 2009
@@ -131,6 +131,36 @@
                }
        }
 
+       protected IRequestTarget checkSecure(IRequestTarget target)
+       {
+               if (portConfig == null)
+               {
+                       return target;
+               }
+               else
+               {
+                       Class<?> pageClass = getPageClass(target);
+                       if (pageClass != null)
+                       {
+                               IRequestTarget redirect = null;
+                               if (hasSecureAnnotation(pageClass))
+                               {
+                                       redirect = 
SwitchProtocolRequestTarget.requireProtocol(Protocol.HTTPS);
+                               }
+                               else
+                               {
+                                       redirect = 
SwitchProtocolRequestTarget.requireProtocol(Protocol.HTTP);
+                               }
+                               if (redirect != null)
+                               {
+                                       return redirect;
+                               }
+
+                       }
+                       return target;
+               }
+       }
+
        /** {...@inheritdoc} */
        @Override
        public IRequestTarget resolve(RequestCycle rc, RequestParameters rp)
@@ -140,24 +170,6 @@
                Session.get().bind();
 
                IRequestTarget target = super.resolve(rc, rp);
-               Class<?> pageClass = getPageClass(target);
-               if (pageClass != null)
-               {
-                       IRequestTarget redirect = null;
-                       if (hasSecureAnnotation(pageClass))
-                       {
-                               redirect = 
SwitchProtocolRequestTarget.requireProtocol(Protocol.HTTPS);
-                       }
-                       else
-                       {
-                               redirect = 
SwitchProtocolRequestTarget.requireProtocol(Protocol.HTTP);
-                       }
-                       if (redirect != null)
-                       {
-                               return redirect;
-                       }
-
-               }
-               return target;
+               return checkSecure(target);
        }
 }