opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16'

Browse Source 
* stable-2.16:
  Set version to 2.16.1-SNAPSHOT
  Set version to 2.15.8-SNAPSHOT
  ElasticTestUtils: Factor common code out of ElasticReindexIT/ElasticIndexIT
  Add support for Elasticsearch 6.5.0
  Add Marco Miller as a developer in pom.xml files
  Fix: Invalid operation for forward only resultset : first
  Set version to 2.16
  Set version to 2.14.17

Change-Id: I8065c31911125fa414452f75fc83290f80cd705e
This commit is contained in:
David Pursehouse
2018-11-15 14:19:01 -08:00
parent 677e399bcb e7e50b81f2
commit ff02f1f49e
16 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/schema/Schema_151.java
View File

@@ -60,7 +60,7 @@ public class Schema_151 extends ReviewDbSchemaVersion {
PreparedStatement addedOnRetrieval, AccountGroup.Id groupId) throws SQLException {
addedOnRetrieval.setInt(1, groupId.get());
try (ResultSet resultSet = addedOnRetrieval.executeQuery()) {
if (resultSet.first()) {
if (resultSet.next()) {
return Optional.of(resultSet.getTimestamp(1));
}
}

2
java/com/google/gerrit/server/schema/Schema_87.java
View File

@@ -59,7 +59,7 @@ public class Schema_87 extends ReviewDbSchemaVersion {
PreparedStatement uuidRetrieval, AccountGroup.Id id) throws SQLException {
uuidRetrieval.setInt(1, id.get());
try (ResultSet uuidResults = uuidRetrieval.executeQuery()) {
if (uuidResults.first()) {
if (uuidResults.next()) {
Optional.of(new AccountGroup.UUID(uuidResults.getString(1)));
}
}