| commit | 84f3e156a4a6dc7847e73c42d27e41665981abd0 | [log] [tgz] |
|---|---|---|
| author | Adithya Chakilam <achakila@codeaurora.org> | Wed Nov 10 11:20:02 2021 -0800 |
| committer | Adithya Chakilam <achakila@codeaurora.org> | Wed Nov 10 11:20:02 2021 -0800 |
| tree | c760982d354b1175a26253ddb3d5f8b59b9e7bee | |
| parent | f2c39756e1dbf9b6f852fb208a48b65232eb0b5e [diff] | |
| parent | bbde3f2d23afc1de55e9c2a73a518b62c557b1fe [diff] |
Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Fix BatchMetaDataUpdate to not close passed in object reader Change-Id: I790dab96d7678d464f0bca2abff2bf256bf8dfdb
diff --git a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java index cce81b0..a4cfcbf 100644 --- a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java +++ b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java
@@ -430,7 +430,7 @@ inserter = null; } - if (reader != null) { + if (objReader == null && reader != null) { reader.close(); reader = null; }