Updated Branches: refs/heads/master fc14b7ee3 -> 5e453cfd8
Minor cleanup in WebXmlFile - fix warnings in the IDE Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1566fca9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1566fca9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1566fca9 Branch: refs/heads/master Commit: 1566fca9a865ac73c08ba7aca01b9c6238a6a8dc Parents: fc14b7e Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Sep 25 16:27:31 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Sep 25 16:27:31 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/util/file/WebXmlFile.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1566fca9/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java b/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java index 2b73980..2c0de5a 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java @@ -59,7 +59,7 @@ public class WebXmlFile * @param isServlet * true if Servlet, false if Filter * @param filterConfig - * @return Filter path retrieved from "url-pattern". Null if not found or error occured + * @return Filter path retrieved from "url-pattern". Null if not found or error occurred */ public final String getUniqueFilterPath(final boolean isServlet, final FilterConfig filterConfig) { @@ -87,15 +87,7 @@ public class WebXmlFile { return getFilterPath(isServlet, filterName, is); } - catch (ParserConfigurationException ex) - { - log.error("Error reading servlet/filter path from web.xml", ex); - } - catch (SAXException ex) - { - log.error("Error reading servlet/filter path from web.xml", ex); - } - catch (IOException ex) + catch (ParserConfigurationException | SAXException | IOException ex) { log.error("Error reading servlet/filter path from web.xml", ex); } @@ -155,7 +147,7 @@ public class WebXmlFile for (String path : paths) { - err.append(" [" + path + "]"); + err.append(" [").append(path).append(']'); } throw new RuntimeException(err.toString()); }
