You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/08/31 01:30:58 UTC
svn commit: r991022 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestChecker.java
Author: ivaynberg
Date: Mon Aug 30 23:30:58 2010
New Revision: 991022
URL: http://svn.apache.org/viewvc?rev=991022&view=rev
Log:
Issue: WICKET-3024
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestChecker.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestChecker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestChecker.java?rev=991022&r1=991021&r2=991022&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestChecker.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestChecker.java Mon Aug 30 23:30:58 2010
@@ -51,7 +51,8 @@ class HttpsRequestChecker
Class<?> pageClass = getPageClass(requestHandler);
if (pageClass != null)
{
- IRequestHandler redirect = null;
+ final IRequestHandler redirect;
+
if (hasSecureAnnotation(pageClass))
{
redirect = SwitchProtocolRequestHandler.requireProtocol(Protocol.HTTPS, httpsConfig);
@@ -90,7 +91,8 @@ class HttpsRequestChecker
Class<?> pageClass = getPageClass(requestHandler);
if (pageClass != null)
{
- IRequestHandler redirect = null;
+ final IRequestHandler redirect;
+
if (hasSecureAnnotation(pageClass))
{
redirect = SwitchProtocolRequestHandler.requireProtocol(Protocol.HTTPS,
@@ -134,10 +136,7 @@ class HttpsRequestChecker
{
return hasSecureAnnotation(klass.getSuperclass());
}
- else
- {
- return false;
- }
+ return false;
}
/**
@@ -150,7 +149,7 @@ class HttpsRequestChecker
{
if (handler instanceof IPageRequestHandler)
{
- return ((IPageRequestHandler)handler).getPage().getClass();
+ return ((IPageRequestHandler)handler).getPageClass();
}
else if (handler instanceof BookmarkablePageRequestHandler)
{