From 52801c1e5b7a4badbdea5a2a1a0d6ccb6825892d Mon Sep 17 00:00:00 2001 From: Martin Muller Date: Mon, 9 Jul 2018 11:17:43 +0100 Subject: [PATCH 1/2] Use java 8 try with resource for closing the streams properly --- src/main/java/org/alfresco/opencmis/CMISUtils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/alfresco/opencmis/CMISUtils.java b/src/main/java/org/alfresco/opencmis/CMISUtils.java index 29f5a5d696..3801cc926b 100644 --- a/src/main/java/org/alfresco/opencmis/CMISUtils.java +++ b/src/main/java/org/alfresco/opencmis/CMISUtils.java @@ -38,10 +38,9 @@ public class CMISUtils public static T copy(T source) { T target = null; - try + try ( CopyOutputStream cos = new CopyOutputStream(); + ObjectOutputStream out = new ObjectOutputStream(cos) ) { - CopyOutputStream cos = new CopyOutputStream(); - ObjectOutputStream out = new ObjectOutputStream(cos); out.writeObject(source); out.flush(); out.close(); From f9db61f65d6c69266fb8af8ea9790e36c8c90417 Mon Sep 17 00:00:00 2001 From: Martin Muller Date: Mon, 9 Jul 2018 12:17:29 +0100 Subject: [PATCH 2/2] the out.close() is redundant at this point. the stream will be closed automatically since Java 7 (not 9) new feature try-with-resource --- src/main/java/org/alfresco/opencmis/CMISUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/alfresco/opencmis/CMISUtils.java b/src/main/java/org/alfresco/opencmis/CMISUtils.java index 3801cc926b..3d1738f7c8 100644 --- a/src/main/java/org/alfresco/opencmis/CMISUtils.java +++ b/src/main/java/org/alfresco/opencmis/CMISUtils.java @@ -43,7 +43,6 @@ public class CMISUtils { out.writeObject(source); out.flush(); - out.close(); ObjectInputStream in = new ObjectInputStream(cos.getInputStream()); target = (T) in.readObject();