From 18c8fa8922c97dadf8ba0a9d57f81b5c37f4e97c Mon Sep 17 00:00:00 2001
From: Edwin Kempin <edwin.kempin@sap.com>
Date: Tue, 16 Oct 2012 16:54:25 +0200
Subject: [PATCH] Ensure that ObjectOutputStream in H2CacheImpl is closed

Change-Id: I8a999a6203254deab2e55e242a660e23616d36c2
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
---
 .../com/google/gerrit/server/cache/h2/H2CacheImpl.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
index a5bdacc77b..9da1afcc2f 100644
--- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
+++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
@@ -277,8 +277,12 @@ public class H2CacheImpl<K, V> extends AbstractLoadingCache<K, V> {
           try {
             ObjectOutputStream ser =
                 new ObjectOutputStream(new SinkOutputStream(into));
-            ser.writeObject(from);
-            ser.flush();
+            try {
+              ser.writeObject(from);
+              ser.flush();
+            } finally {
+              ser.close();
+            }
           } catch (IOException err) {
             throw new RuntimeException("Cannot hash as Serializable", err);
           }