From dd119edafebcfba873ce6be7b5a02eb6082d853f Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Tue, 4 Jun 2013 05:09:04 -0400 Subject: [PATCH] minor bug fix Former-commit-id: 0f0d101a22e904db91348dd40a40780d9bcb85ad --- .../org/owasp/dependencycheck/analyzer/JarAnalyzer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java index e41d88d55..3496deec2 100644 --- a/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java +++ b/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java @@ -265,7 +265,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { } catch (IOException ex) { Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE, null, ex); } - foundSomething |= setPomEvidence(dependency, pom, pomProperties); + foundSomething = setPomEvidence(dependency, pom, pomProperties) || foundSomething; } return foundSomething; } @@ -299,13 +299,13 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { */ private List retrievePomListing(final JarFile jar) throws IOException { final List pomEntries = new ArrayList(); - JarEntry entry = jar.entries().nextElement(); - while (entry != null) { + final Enumeration entries = jar.entries(); + while (entries.hasMoreElements()) { + JarEntry entry = entries.nextElement(); final String entryName = (new File(entry.getName())).getName().toLowerCase(); if (!entry.isDirectory() && "pom.xml".equals(entryName)) { pomEntries.add(entry.getName()); } - entry = jar.entries().nextElement(); } return pomEntries; }