You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/06/29 13:35:22 UTC
[2/3] wicket git commit: FindBugs: Check for non-null 'files' before
staring to iterate over it.
FindBugs: Check for non-null 'files' before staring to iterate over it.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3311b078
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3311b078
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3311b078
Branch: refs/heads/master
Commit: 3311b0789ea26be6bddb0277f929c06d2a532051
Parents: 2f21e12
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 29 14:30:01 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 29 14:30:01 2015 +0300
----------------------------------------------------------------------
.../wicket/util/resource/ZipResourceStream.java | 49 +++++++++++---------
1 file changed, 26 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3311b078/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 cea2a45..270dd67 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
@@ -132,41 +132,44 @@ public class ZipResourceStream extends AbstractResourceStream
BufferedInputStream origin;
byte data[] = new byte[BUFFER];
- for (String file : files)
+ if (files != null)
{
- if (log.isDebugEnabled())
+ for (String file : files)
{
- log.debug("Adding: '{}'", file);
- }
- File f = new File(dir, file);
- if (f.isDirectory())
- {
- if (recursive)
+ if (log.isDebugEnabled())
{
- zipDir(f, out, path + f.getName() + "/", recursive);
+ log.debug("Adding: '{}'", file);
}
- }
- else
- {
- out.putNextEntry(new ZipEntry(path + f.getName()));
+ File f = new File(dir, file);
+ if (f.isDirectory())
+ {
+ if (recursive)
+ {
+ zipDir(f, out, path + f.getName() + "/", recursive);
+ }
+ } else
+ {
+ out.putNextEntry(new ZipEntry(path + f.getName()));
- FileInputStream fi = new FileInputStream(f);
- origin = new BufferedInputStream(fi, BUFFER);
+ FileInputStream fi = new FileInputStream(f);
+ origin = new BufferedInputStream(fi, BUFFER);
- try
- {
- int count;
- while ((count = origin.read(data, 0, BUFFER)) != -1)
+ try
+ {
+ int count;
+ while ((count = origin.read(data, 0, BUFFER)) != -1)
+ {
+ out.write(data, 0, count);
+ }
+ } finally
{
- out.write(data, 0, count);
+ origin.close();
}
- } finally {
- origin.close();
}
}
}
- if (path.equals(""))
+ if ("".equals(path))
{
out.close();
}