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/11/15 22:45:20 UTC
svn commit: r1035469 -
/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java
Author: ivaynberg
Date: Mon Nov 15 21:45:19 2010
New Revision: 1035469
URL: http://svn.apache.org/viewvc?rev=1035469&view=rev
Log:
Issue: WICKET-3173
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java?rev=1035469&r1=1035468&r2=1035469&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsRequestCycleProcessor.java Mon Nov 15 21:45:19 2010
@@ -209,11 +209,11 @@ public class HttpsRequestCycleProcessor
@Override
public IRequestTarget resolve(RequestCycle rc, RequestParameters rp)
{
- if (portConfig.isPreferStateful())
+ if (portConfig != null && portConfig.isPreferStateful())
{
- // we need to persist the session before a redirect to https so the session lasts across
- // both http and https calls.
- Session.get().bind();
+ // we need to persist the session before a redirect to https so the session lasts across
+ // both http and https calls.
+ Session.get().bind();
}
IRequestTarget target = super.resolve(rc, rp);