mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 09:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert experiemental sql query timeout

Browse Source
This commit is contained in:
jmillman 2015-12-01 15:55:25 -05:00
parent 6f2646d061
commit 67dbaa4cdc
2 changed files with 71 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Core/src/org/sleuthkit/autopsy/timeline/db/EventDB.java
View File

@ -26,7 +26,6 @@ import java.sql.DriverManager;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.SQLTimeoutException;
import java.sql.Statement; import java.sql.Statement;
import java.sql.Types; import java.sql.Types;
import java.util.ArrayList; import java.util.ArrayList;
@ -53,7 +52,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.joda.time.DateTimeZone; import org.joda.time.DateTimeZone;
import org.joda.time.Interval; import org.joda.time.Interval;
import org.joda.time.Period; import org.joda.time.Period;
import org.openide.util.Exceptions;
import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.coreutils.Version;
@ -1113,18 +1111,11 @@ public class EventDB {
List<EventCluster> events = new ArrayList<>(); List<EventCluster> events = new ArrayList<>();
DBLock.lock(); DBLock.lock();
try (Statement createStatement = con.createStatement();) { try (Statement createStatement = con.createStatement();
createStatement.setQueryTimeout(1); ResultSet rs = createStatement.executeQuery(query)) {
try (ResultSet rs = createStatement.executeQuery(query)) {
while (rs.next()) { while (rs.next()) {
events.add(eventClusterHelper(rs, useSubTypes, descriptionLOD, filter.getTagsFilter())); events.add(eventClusterHelper(rs, useSubTypes, descriptionLOD, filter.getTagsFilter()));
} }
}
} catch (SQLTimeoutException timeout) {
Exceptions.printStackTrace(timeout);
} catch (SQLException ex) { } catch (SQLException ex) {
LOGGER.log(Level.SEVERE, "Failed to get events with query: " + query, ex); // NON-NLS LOGGER.log(Level.SEVERE, "Failed to get events with query: " + query, ex); // NON-NLS
} finally { } finally {