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

findbugs/checkstyle patches

Browse Source 
Former-commit-id: b00c0681a799cea260a2aa6de6aa210709199589
This commit is contained in:
Jeremy Long
2014-01-03 14:56:18 -05:00
parent a6cab8fddc
commit e61fb6f206
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java
View File

@@ -218,7 +218,7 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Anal
final String oneParent = one.getParent(); final String oneParent = one.getParent();
final String twoParent = two.getParent(); final String twoParent = two.getParent();
if (oneParent != null) { if (oneParent != null) {
if (twoParent != null && oneParent.equals(twoParent)) { if (oneParent.equals(twoParent)) {
fileName1 = one.getName(); fileName1 = one.getName();
fileName2 = two.getName(); fileName2 = two.getName();
} else { } else {

4
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
View File

@@ -409,9 +409,10 @@ public class CveDB {
*/ */
Properties getProperties() { Properties getProperties() {
final Properties prop = new Properties(); final Properties prop = new Properties();
PreparedStatement ps = null;
ResultSet rs = null; ResultSet rs = null;
try { try {
final PreparedStatement ps = getConnection().prepareStatement(SELECT_PROPERTIES); ps = getConnection().prepareStatement(SELECT_PROPERTIES);
rs = ps.executeQuery(); rs = ps.executeQuery();
while (rs.next()) { while (rs.next()) {
prop.setProperty(rs.getString(1), rs.getString(2)); prop.setProperty(rs.getString(1), rs.getString(2));
@@ -421,6 +422,7 @@ public class CveDB {
Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, msg); Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, msg);
Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex);
} finally { } finally {
DBUtils.closeStatement(ps);
DBUtils.closeResultSet(rs); DBUtils.closeResultSet(rs);
} }
return prop; return prop;

6
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/ProcessTask.java
View File

@@ -140,6 +140,12 @@ public class ProcessTask implements Callable<ProcessTask> {
saxParser.parse(file, cve20Handler); saxParser.parse(file, cve20Handler);
} }
/**
* Processes the NVD CVE XML file and imports the data into the DB.
*
* @throws UpdateException thrown if there is an error loading the data into
* the database
*/
private void processFiles() throws UpdateException { private void processFiles() throws UpdateException {
String msg = String.format("Processing Started for NVD CVE - %s", filePair.getNvdCveInfo().getId()); String msg = String.format("Processing Started for NVD CVE - %s", filePair.getNvdCveInfo().getId());
Logger.getLogger(StandardUpdate.class.getName()).log(Level.INFO, msg); Logger.getLogger(StandardUpdate.class.getName()).log(Level.INFO, msg);