From 06b6bd254a6433c1e67d260c6e8ede2d7236fbe7 Mon Sep 17 00:00:00 2001 From: Alexis Durgnat <alexis.durgnat@etu.hesge.ch> Date: Fri, 1 Feb 2019 15:13:17 +0100 Subject: [PATCH] Try -> Try-with-ressources --- src/main/java/ch/hepia/mq/MessageQueue.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/ch/hepia/mq/MessageQueue.java b/src/main/java/ch/hepia/mq/MessageQueue.java index e898fb7..ab6d2d8 100644 --- a/src/main/java/ch/hepia/mq/MessageQueue.java +++ b/src/main/java/ch/hepia/mq/MessageQueue.java @@ -55,32 +55,29 @@ public abstract class MessageQueue { } public static <T extends Serializable> byte[] serialize(T object){ - ObjectOutputStream oos = null; - ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); - try { - oos = new ObjectOutputStream(byteStream); + try ( + ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(byteStream) + ) { oos.writeObject(object); oos.flush(); return byteStream.toByteArray(); } catch (final Exception e) { e.printStackTrace(); - }finally{ - // TODO System.exit(1); } return null; } public static <T extends Serializable> T unserialize(byte[] serializedData){ - ByteArrayInputStream inputStream = new ByteArrayInputStream(serializedData); T result = null; - try { - ObjectInputStream ois = new ObjectInputStream(inputStream); + try ( + ByteArrayInputStream inputStream = new ByteArrayInputStream(serializedData); + ObjectInputStream ois = new ObjectInputStream(inputStream) + ) { result = (T) ois.readObject(); } catch (final Exception e) { e.printStackTrace(); - }finally{ - // TODO System.exit(1); } return result; -- GitLab