Skip to content

Commit 306684f

Browse files
committed
use 'var' in ResultSetsSet
1 parent 64e5ef7 commit 306684f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResultSetsSet.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
import java.sql.ResultSet;
88
import java.util.HashMap;
9-
import java.util.Iterator;
10-
import java.util.Map;
119
import java.util.function.Consumer;
1210

1311
/**
@@ -75,9 +73,9 @@ else if ( more != null ) {
7573
//Any entry will do, so we take the first one if there's any.
7674
private void scaleDown() {
7775
if ( more != null && !more.isEmpty() ) {
78-
Iterator<Map.Entry<ResultSet, ResultSet>> iterator = more.entrySet().iterator();
79-
Map.Entry<ResultSet, ResultSet> entry = iterator.next();
80-
final ResultSet resultSet = entry.getKey();
76+
var iterator = more.entrySet().iterator();
77+
var entry = iterator.next();
78+
final var resultSet = entry.getKey();
8179
iterator.remove();
8280
first = resultSet;
8381
}

hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResultsetsTrackingContainer.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,10 @@ else if ( xref != null ) {
174174
}
175175

176176
private boolean warnOnNotNull(ResultSetsSet existingEntry) {
177-
// Keep this at DEBUG level, rather than warn. Numerous connection pool implementations can return a
178-
// proxy/wrapper around the JDBC Statement, causing excessive logging here. See HHH-8210.
177+
// Keep this at DEBUG level, rather than WARN.
178+
// Connection pool implementations often return a
179+
// proxy/wrapper around the JDBC Statement,
180+
// causing excessive logging here. See HHH-8210.
179181
if ( existingEntry == null ) {
180182
CORE_LOGGER.trace( "ResultSet statement was not registered (on register)" );
181183
}

0 commit comments

Comments
 (0)