Author: danhaywood
Date: Fri Nov 23 17:39:28 2012
New Revision: 1412999
URL: http://svn.apache.org/viewvc?rev=1412999&view=rev
Log:
ISIS-232: fixing logout stacktrace for IE
Modified:
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
Modified:
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java?rev=1412999&r1=1412998&r2=1412999&view=diff
==============================================================================
---
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
(original)
+++
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
Fri Nov 23 17:39:28 2012
@@ -95,14 +95,20 @@ public abstract class PageAbstract exten
private String applicationJs;
public PageAbstract(final PageParameters pageParameters, final
ComponentType... childComponentIds) {
- addApplicationActionsComponent();
- this.childComponentIds =
Collections.unmodifiableList(Arrays.asList(childComponentIds));
- this.pageParameters = pageParameters;
- addApplicationName();
- addUserName();
- addLogoutLink();
- addAboutLink();
- add(new Label(ID_PAGE_TITLE,
PageParameterNames.PAGE_TITLE.getStringFrom(pageParameters, applicationName)));
+ try {
+ addApplicationActionsComponent();
+ this.childComponentIds =
Collections.unmodifiableList(Arrays.asList(childComponentIds));
+ this.pageParameters = pageParameters;
+ addApplicationName();
+ addUserName();
+ addLogoutLink();
+ addAboutLink();
+ add(new Label(ID_PAGE_TITLE,
PageParameterNames.PAGE_TITLE.getStringFrom(pageParameters, applicationName)));
+ } catch(RuntimeException ex) {
+ // hack for IE
+ getSession().invalidate();
+ throw new
RestartResponseAtInterceptPageException(WicketSignInPage.class);
+ }
}
@Override
