Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x 7b239ca45 -> ae7a0f8b9


Revert "WICKET-6295 fallback to home page"

This reverts commit 7b239ca45a876a9b90da6e90001bcbb36578574b.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ae7a0f8b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ae7a0f8b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ae7a0f8b

Branch: refs/heads/wicket-6.x
Commit: ae7a0f8b925d97eec6c7a6a9d71d6cd92035b3b8
Parents: 7b239ca
Author: Sven Meier <svenme...@apache.org>
Authored: Fri Dec 9 15:56:50 2016 +0100
Committer: Sven Meier <svenme...@apache.org>
Committed: Fri Dec 9 15:56:50 2016 +0100

----------------------------------------------------------------------
 .../markup/html/pages/BrowserInfoPage.java      | 24 ++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7a0f8b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
 
b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
index 507cd9e..373cbb5 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
@@ -25,12 +25,14 @@ import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.protocol.http.ClientProperties;
 import org.apache.wicket.protocol.http.WebSession;
 import org.apache.wicket.protocol.http.request.WebClientInfo;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.settings.IRequestCycleSettings;
 
 /**
+ * <p>
  * This page uses a form post right after the page has loaded in the browser, 
using JavaScript or
  * alternative means to detect and pass on settings to the embedded form. The 
form submit method
  * updates this session's {@link org.apache.wicket.core.request.ClientInfo} 
object and then redirects to
@@ -51,24 +53,28 @@ public class BrowserInfoPage extends WebPage
        private BrowserInfoForm browserInfoForm;
 
        /**
-        * This constructor will be called twice, once to display the initial 
page and additionally when JavaScript
-        * is not enabled and the meta refresh fires or the user clicks the 
link instead.
+        * Bookmarkable constructor. This is not for normal framework client 
use. It will be called
+        * whenever JavaScript is not supported, and the browser info page's 
meta refresh fires to this
+        * page. Prior to this, the other constructor should already have been 
called.
         */
        public BrowserInfoPage()
        {
                initComps();
                RequestCycle requestCycle = getRequestCycle();
                WebSession session = (WebSession)getSession();
-
                WebClientInfo clientInfo = session.getClientInfo();
-               if (clientInfo != null)
+               if (clientInfo == null)
                {
-                       // clientInfo is already present so continue
-                       continueToOriginalDestination();
-                       
-                       // switch to home page if no original destination was 
intercepted
-                       setResponsePage(getApplication().getHomePage());
+                       clientInfo = new WebClientInfo(requestCycle);
+                       getSession().setClientInfo(clientInfo);
                }
+               else
+               {
+                       ClientProperties properties = 
clientInfo.getProperties();
+                       properties.setJavaEnabled(false);
+               }
+
+               continueToOriginalDestination();
        }
 
        @Override

Reply via email to