Include links to root URL, even if no failure page is identified in the request 
(often due to a failure loading a page)


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/04a7edca
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/04a7edca
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/04a7edca

Branch: refs/heads/master
Commit: 04a7edcaac06b9d2c13dfb16c4619fe75d2725c4
Parents: d5c3bea
Author: Howard M. Lewis Ship <hls...@apache.org>
Authored: Tue Apr 7 14:20:59 2015 -0700
Committer: Howard M. Lewis Ship <hls...@apache.org>
Committed: Tue Apr 7 14:20:59 2015 -0700

----------------------------------------------------------------------
 .../tapestry5/corelib/pages/ExceptionReport.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/04a7edca/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
----------------------------------------------------------------------
diff --git 
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
 
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
index 06208e0..3dfae92 100644
--- 
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
+++ 
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
@@ -205,7 +205,7 @@ public class ExceptionReport extends AbstractInternalPage 
implements ExceptionRe
                         
linkSource.createPageRenderLinkWithContext(failurePage, pac),
                         "Go to page <strong>%s</strong>", failurePage);
 
-                if (! productionMode)
+                if (!productionMode)
                 {
                     add(links,
                             resources.createEventLink("reloadFirst", 
pac).addParameter("loadPage", failurePage),
@@ -216,24 +216,23 @@ public class ExceptionReport extends AbstractInternalPage 
implements ExceptionRe
             {
                 // Ignore.
             }
+        }
 
-            links.add(new ActionLink(rootURL,
-                    String.format("Go to <strong>%s</strong>", rootURL)));
-
+        links.add(new ActionLink(rootURL,
+                String.format("Go to <strong>%s</strong>", rootURL)));
 
-            if (! productionMode) {
-                add(links,
-                        resources.createEventLink("reloadFirst"),
-                        "Go to <strong>%s</strong> (with reload)", rootURL);
 
-            }
+        if (!productionMode)
+        {
+            add(links,
+                    resources.createEventLink("reloadFirst"),
+                    "Go to <strong>%s</strong> (with reload)", rootURL);
         }
 
         return links;
     }
 
 
-
     Object onReloadFirst(EventContext reloadContext)
     {
         reloadHelper.forceReload();

Reply via email to