SPY-49: BaseSerializingTranscoder does not close resources.

Change-Id: Ifa6b356a9faaad39f12f2cf28d34fbc837faa7b7
Reviewed-on: http://review.couchbase.org/9454
Reviewed-by: Michael Wiederhold <[email protected]>
Tested-by: Michael Wiederhold <[email protected]>

Author: Mike Wiederhold

src/main/java/net/spy/memcached/transcoders/BaseSerializingTranscoder.java

@@ -75,15 +75,20 @@ protected byte[] serialize(Object o) {
 			throw new NullPointerException("Can't serialize null");
 		}
 		byte[] rv=null;
+		ByteArrayOutputStream bos = null;
+		ObjectOutputStream os = null;
 		try {
-			ByteArrayOutputStream bos=new ByteArrayOutputStream();
-			ObjectOutputStream os=new ObjectOutputStream(bos);
+			bos=new ByteArrayOutputStream();
+			os=new ObjectOutputStream(bos);
 			os.writeObject(o);
 			os.close();
 			bos.close();
 			rv=bos.toByteArray();
 		} catch(IOException e) {
 			throw new IllegalArgumentException("Non-serializable object", e);
+		} finally {
+			CloseUtil.close(os);
+			CloseUtil.close(bos);
 		}
 		return rv;
 	}
@@ -93,10 +98,12 @@ protected byte[] serialize(Object o) {
 	 */
 	protected Object deserialize(byte[] in) {
 		Object rv=null;
+		ByteArrayInputStream bis = null;
+		ObjectInputStream is = null;
 		try {
 			if(in != null) {
-				ByteArrayInputStream bis=new ByteArrayInputStream(in);
-				ObjectInputStream is=new ObjectInputStream(bis);
+				bis=new ByteArrayInputStream(in);
+				is=new ObjectInputStream(bis);
 				rv=is.readObject();
 				is.close();
 				bis.close();
@@ -107,6 +114,9 @@ protected Object deserialize(byte[] in) {
 		} catch (ClassNotFoundException e) {
 			getLogger().warn("Caught CNFE decoding %d bytes of data",
 					in == null ? 0 : in.length, e);
+		} finally {
+			CloseUtil.close(is);
+			CloseUtil.close(bis);
 		}
 		return rv;
 	}
@@ -144,7 +154,7 @@ protected byte[] decompress(byte[] in) {
 		if(in != null) {
 			ByteArrayInputStream bis=new ByteArrayInputStream(in);
 			bos=new ByteArrayOutputStream();
-			GZIPInputStream gis;
+			GZIPInputStream gis = null;
 			try {
 				gis = new GZIPInputStream(bis);
 
@@ -156,6 +166,10 @@ protected byte[] decompress(byte[] in) {
 			} catch (IOException e) {
 				getLogger().warn("Failed to decompress data", e);
 				bos = null;
+			} finally {
+				CloseUtil.close(gis);
+				CloseUtil.close(bis);
+				CloseUtil.close(bos);
 			}
 		}
 		return bos == null ? null : bos.toByteArray();