You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/11/29 18:47:08 UTC
[myfaces-tobago] branch master updated: TOBAGO-1782: Clean up * try
to satisfy code checker sonatype
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new c078491 TOBAGO-1782: Clean up * try to satisfy code checker sonatype
c078491 is described below
commit c078491f29038d3d7cef6ac2518ee5e883c98c58
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 29 19:47:02 2017 +0100
TOBAGO-1782: Clean up
* try to satisfy code checker sonatype
---
.../apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java | 4 ++--
.../org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
index 8e62484..bf0717d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
@@ -58,8 +58,8 @@ public class TobagoConfigBuilder {
try {
final TobagoConfigBuilder builder = new TobagoConfigBuilder(servletContext);
builder.build();
- } catch (final Throwable e) {
- final String error = "Error while deploy process. Tobago can't be initialized! Application will not run!";
+ } catch (final Error|Exception e) {
+ final String error = "Error while deployment. Tobago can't be initialized! Application will not run correctly!";
LOG.error(error, e);
if (e instanceof Error) {
throw (Error) e;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
index 9229b7d..6d85f11 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
@@ -146,7 +146,7 @@ public class TobagoConfigSorter implements Comparator<TobagoConfigFragment> {
final Sanitizer sanitizer = aClass.newInstance();
sanitizer.setProperties(sanitizerProperties);
result.setSanitizer(sanitizer);
- } catch (final Throwable e) {
+ } catch (final Error|Exception e) {
LOG.error("Can't create sanitizer: '" + sanitizerClass + "'", e);
result.setSanitizer(new IgnoringSanitizer());
}
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].