From 8698c2740d32bb984cf21763f2d5a73cf6bbde62 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Thu, 11 Oct 2018 01:01:19 -0400 Subject: [PATCH] Fix NullListQueryMapper.java for java6 --- .../com/moparisthebest/jdbc/NullListQueryMapper.java | 10 ++++------ .../java/com/moparisthebest/jdbc/NullQueryMapper.java | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/querymapper/src/main/java/com/moparisthebest/jdbc/NullListQueryMapper.java b/querymapper/src/main/java/com/moparisthebest/jdbc/NullListQueryMapper.java index b59c141..1556f61 100644 --- a/querymapper/src/main/java/com/moparisthebest/jdbc/NullListQueryMapper.java +++ b/querymapper/src/main/java/com/moparisthebest/jdbc/NullListQueryMapper.java @@ -5,15 +5,13 @@ import com.moparisthebest.jdbc.util.ResultSetIterable; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.util.*; +//IFJAVA8_START import java.util.stream.Stream; +//IFJAVA8_END import static com.moparisthebest.jdbc.NullQueryMapper.safeHandler; -//IFJAVA8_START -//IFJAVA8_END - public class NullListQueryMapper extends ListQueryMapper { protected final NullQueryMapper.ThrowableHandler handler; @@ -90,7 +88,7 @@ public class NullListQueryMapper extends ListQueryMapper { public InList.InListObject inList(String columnName, Collection values) { try { return delegate.inList(columnName, values); - } catch (SQLException e) { + } catch (Throwable e) { handler.handle(e); } return null; @@ -100,7 +98,7 @@ public class NullListQueryMapper extends ListQueryMapper { public InList.InListObject notInList(String columnName, Collection values) { try { return delegate.notInList(columnName, values); - } catch (SQLException e) { + } catch (Throwable e) { handler.handle(e); } return null; diff --git a/querymapper/src/main/java/com/moparisthebest/jdbc/NullQueryMapper.java b/querymapper/src/main/java/com/moparisthebest/jdbc/NullQueryMapper.java index 01966bc..c4db21d 100644 --- a/querymapper/src/main/java/com/moparisthebest/jdbc/NullQueryMapper.java +++ b/querymapper/src/main/java/com/moparisthebest/jdbc/NullQueryMapper.java @@ -5,7 +5,6 @@ import com.moparisthebest.jdbc.util.ResultSetIterable; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.util.*; //IFJAVA8_START import java.util.stream.Stream;