Minor non-functional improvements: - use SLF4J placeholders - fix a typo in error message - simplify condition
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a30f3caf Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a30f3caf Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a30f3caf Branch: refs/heads/master Commit: a30f3caf079f6b8ab45a515b0ddfcfc53df91103 Parents: 9f08f56 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Wed May 27 08:40:07 2015 +0300 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Wed May 27 08:41:08 2015 +0300 ---------------------------------------------------------------------- .../apache/wicket/core/util/resource/UrlResourceStream.java | 2 +- .../wicket/core/util/resource/WebExternalResourceStream.java | 2 +- .../org/apache/wicket/util/resource/ZipResourceStream.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a30f3caf/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java index e9d751c..cb905df 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java @@ -219,7 +219,7 @@ public class UrlResourceStream extends AbstractResourceStream } catch (IOException e) { - log.warn("getLastModified for " + url + " failed: " + e.getMessage()); + log.warn("getLastModified() for '{}' failed: {}", url, e.getMessage()); // allow modification watcher to detect the problem return null; http://git-wip-us.apache.org/repos/asf/wicket/blob/a30f3caf/wicket-core/src/main/java/org/apache/wicket/core/util/resource/WebExternalResourceStream.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/WebExternalResourceStream.java b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/WebExternalResourceStream.java index 3991b28..9697a18 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/WebExternalResourceStream.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/WebExternalResourceStream.java @@ -88,7 +88,7 @@ public class WebExternalResourceStream extends AbstractResourceStream if (resourceURL == null) { throw new FileNotFoundException("Unable to find resource '" + url + - "' in the serlvet context"); + "' in the servlet context"); } return Connections.getLastModified(resourceURL); http://git-wip-us.apache.org/repos/asf/wicket/blob/a30f3caf/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java index 0be44ae..cea2a45 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java @@ -129,7 +129,7 @@ public class ZipResourceStream extends AbstractResourceStream String[] files = dir.list(); int BUFFER = 2048; - BufferedInputStream origin = null; + BufferedInputStream origin; byte data[] = new byte[BUFFER]; for (String file : files) @@ -141,7 +141,7 @@ public class ZipResourceStream extends AbstractResourceStream File f = new File(dir, file); if (f.isDirectory()) { - if (recursive == true) + if (recursive) { zipDir(f, out, path + f.getName() + "/", recursive); } @@ -215,4 +215,4 @@ public class ZipResourceStream extends AbstractResourceStream { return null; } -} \ No newline at end of file +}
