moparisthebest/JdbcMapper
1
0
Fork 0
mirror of https://github.com/moparisthebest/JdbcMapper synced 2024-12-21 23:08:52 -05:00
Code Issues Releases Wiki Activity

Fix ResultSet leak in toStream

Browse Source
This commit is contained in:
Travis Burtrum 2018-09-06 01:15:20 -04:00
parent d85e5ce7f1
commit 8e677aa92e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/com/moparisthebest/jdbc/util/ResultSetIterable.java
View File

@ -21,7 +21,7 @@ import static com.moparisthebest.jdbc.TryClose.tryClose;
* This has some special semantics the caller must be aware of though: * This has some special semantics the caller must be aware of though:
* <p> * <p>
* 1. It has to be closed in a finally just like a ResultSet so it can close it's underlying ResultSet * 1. It has to be closed in a finally just like a ResultSet so it can close it's underlying ResultSet
* 2. Call to .iterator() just returns this, meaning you can only loop over it once, if you need to loop multiple times get a List or something * 2. The .iterator() implementation just returns this, meaning you can only loop over it once, if you need to loop multiple times get a List or something
* 3. This guarantees that the ResultSet/Calendar you send into this class with the ResultSetToObject will be the only * 3. This guarantees that the ResultSet/Calendar you send into this class with the ResultSetToObject will be the only
* instances sent into the ResultSetToObject.toObject() method, so if you do fancy initialization of some sort you can * instances sent into the ResultSetToObject.toObject() method, so if you do fancy initialization of some sort you can
* do it in the constructor based on those instances, or once on the first call to .toObject() and cache it forever. * do it in the constructor based on those instances, or once on the first call to .toObject() and cache it forever.
@ -79,7 +79,8 @@ public class ResultSetIterable<T> implements Iterable<T>, Iterator<T>, Closeable
public static <T> Stream<T> getStream(final ResultSet rs, final ResultSetToObject<T> rsto, final Calendar cal) { public static <T> Stream<T> getStream(final ResultSet rs, final ResultSetToObject<T> rsto, final Calendar cal) {
final Stream<T> ret; final Stream<T> ret;
if (rsto == null) { if (rsto == null) {
// todo: static object for this? don't forget to close resultset if so tryClose(rs); // have to do this here...
// todo: static object for this?
return (Stream<T>) StreamSupport.stream(Spliterators.emptySpliterator(), false); return (Stream<T>) StreamSupport.stream(Spliterators.emptySpliterator(), false);
} else { } else {
final ResultSetIterable<T> rsi = new ResultSetIterable<T>(rs, rsto, cal); final ResultSetIterable<T> rsi = new ResultSetIterable<T>(rs, rsto, cal);