| commit | dbbb1b67667057c78b2ff4b0cb2fb498aedbf678 | [log] [tgz] |
|---|---|---|
| author | Adithya Chakilam <achakila@codeaurora.org> | Wed Nov 10 12:14:49 2021 -0800 |
| committer | Adithya Chakilam <achakila@codeaurora.org> | Wed Nov 10 12:14:49 2021 -0800 |
| tree | a4a468dbc96e61baa2d28e9aa88791e253bcf9f4 | |
| parent | a74b39d8b4654c0ab5d46135d8375340c84cc42d [diff] | |
| parent | 84f3e156a4a6dc7847e73c42d27e41665981abd0 [diff] |
Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Fix BatchMetaDataUpdate to not close passed in object reader Change-Id: I3fb7e64f3619068b7a0d70dcbdf94cbcdd5bfed8
diff --git a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java index f0246a3..eaaf375 100644 --- a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java +++ b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java
@@ -433,7 +433,7 @@ inserter = null; } - if (reader != null) { + if (objReader == null && reader != null) { reader.close(); reader = null; }