github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-22 09:09:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

ensured FileInputStream is correctly closed

Browse Source 
Former-commit-id: 6e0362476f456e5af07e686fdccf04e600a97de8
This commit is contained in:
Jeremy Long
2014-08-05 09:19:35 -04:00
parent fabe1aa940
commit c6dbc01912
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java
View File

@@ -27,11 +27,9 @@ import java.io.Reader;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParserFactory;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.XMLReader; import org.xml.sax.XMLReader;
@@ -68,17 +66,27 @@ public class SuppressionParser {
* @throws SuppressionParseException thrown if the xml file cannot be parsed * @throws SuppressionParseException thrown if the xml file cannot be parsed
*/ */
public List<SuppressionRule> parseSuppressionRules(File file) throws SuppressionParseException { public List<SuppressionRule> parseSuppressionRules(File file) throws SuppressionParseException {
FileInputStream fis = null;
try { try {
return parseSuppressionRules(new FileInputStream(file)); fis = new FileInputStream(file);
return parseSuppressionRules(fis);
} catch (IOException ex) { } catch (IOException ex) {
LOGGER.log(Level.FINE, null, ex); LOGGER.log(Level.FINE, null, ex);
throw new SuppressionParseException(ex); throw new SuppressionParseException(ex);
} finally {
if (fis != null) {
try {
fis.close();
} catch (IOException ex) {
LOGGER.log(Level.FINE, "Unable to close stream", ex);
}
}
} }
} }
/** /**
* Parses the given xml stream and returns a list of the suppression rules contained. * Parses the given xml stream and returns a list of the suppression rules contained.
* *
* @param inputStream an InputStream containing suppression rues * @param inputStream an InputStream containing suppression rues
* @return a list of suppression rules * @return a list of suppression rules
* @throws SuppressionParseException if the xml cannot be parsed * @throws SuppressionParseException if the xml cannot be parsed