Add context path to viewexpiredexception URL

zanata · Feb 24, 2016 · b467142 · b467142
1 parent 5c0f867
commit b467142
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/zanata-war/src/main/java/org/zanata/exception/handler/ViewExpiredExceptionHandler.java b/zanata-war/src/main/java/org/zanata/exception/handler/ViewExpiredExceptionHandler.java
@@ -35,7 +35,7 @@
 @ExceptionHandler
 public class ViewExpiredExceptionHandler extends AbstractExceptionHandler {
     public void handleException(@Handles ExceptionEvent<ViewExpiredException> event) {
-        handle(event, LogLevel.Debug, "/error/viewexpiredexception", FacesMessage.SEVERITY_WARN,
+        handle(event, LogLevel.Debug, urlUtil.viewExpiredErrorPage(), FacesMessage.SEVERITY_WARN,
                 "jsf.YourSessionHasTimedOutPleaseTryAgain");
     }
 }
diff --git a/zanata-war/src/main/java/org/zanata/util/UrlUtil.java b/zanata-war/src/main/java/org/zanata/util/UrlUtil.java
@@ -286,6 +286,13 @@ public String genericErrorPage() {
         return contextPath + "/error" + dswidQuery;
     }
 
+    /**
+     * Get view expired url with dswid parameter
+     */
+    public String viewExpiredErrorPage() {
+        return contextPath + "/error/viewexpiredexception" + dswidQuery;
+    }
+
     /**
      * Get sign-in url with dswid parameter
      */