[isis] branch master updated: ISIS-2072: now any exception will cause fallback welcome text to be used

[jd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jdoornenbal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new ee9bdef  ISIS-2072: now any exception will cause fallback welcome text to be used
ee9bdef is described below

commit ee9bdef08eeeaf545731ffd638167c7a467bc433
Author: Johan Doornenbal <jo...@filternet.nl>
AuthorDate: Tue Jan 29 11:11:37 2019 +0100

    ISIS-2072: now any exception will cause fallback welcome text to be used
---
 .../org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 7dfa3d5..5ec7809 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -19,7 +19,6 @@
 
 package org.apache.isis.viewer.wicket.viewer;
 
-import java.io.IOException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
@@ -572,7 +571,7 @@ public class IsisWicketApplication
         try {
             List<String> readLines = Resources.readLines(resource, Charsets.UTF_8);
             return Joiner.on("\n").join(readLines);
-        } catch (IOException | IllegalArgumentException e) {
+        } catch (Exception e) {
             return fallback;
         }
     }