From 1fce97d052d593316ae6f6ccc59b5c9ec8194913 Mon Sep 17 00:00:00 2001 From: mopuser Date: Thu, 12 Nov 2020 00:20:26 +0000 Subject: [PATCH 1/2] Fix: flushes ByteArrayOutputStream before using --- .../main/java/org/apache/shiro/lang/io/DefaultSerializer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/src/main/java/org/apache/shiro/lang/io/DefaultSerializer.java b/lang/src/main/java/org/apache/shiro/lang/io/DefaultSerializer.java index 03d06c6acc..60ecf28e84 100644 --- a/lang/src/main/java/org/apache/shiro/lang/io/DefaultSerializer.java +++ b/lang/src/main/java/org/apache/shiro/lang/io/DefaultSerializer.java @@ -47,6 +47,7 @@ public byte[] serialize(T o) throws SerializationException { ObjectOutputStream oos = new ObjectOutputStream(bos); oos.writeObject(o); oos.close(); + baos.flush(); return baos.toByteArray(); } catch (IOException e) { String msg = "Unable to serialize object [" + o + "]. " + From a2365b3cc4a47be291d226bc95ce8574fd7e5c94 Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Mon, 16 Nov 2020 10:06:03 -0500 Subject: [PATCH 2/2] fixed whitespace --- .../main/java/org/apache/shiro/lang/io/DefaultSerializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/src/main/java/org/apache/shiro/lang/io/DefaultSerializer.java b/lang/src/main/java/org/apache/shiro/lang/io/DefaultSerializer.java index 60ecf28e84..a48a176cae 100644 --- a/lang/src/main/java/org/apache/shiro/lang/io/DefaultSerializer.java +++ b/lang/src/main/java/org/apache/shiro/lang/io/DefaultSerializer.java @@ -47,7 +47,7 @@ public byte[] serialize(T o) throws SerializationException { ObjectOutputStream oos = new ObjectOutputStream(bos); oos.writeObject(o); oos.close(); - baos.flush(); + baos.flush(); return baos.toByteArray(); } catch (IOException e) { String msg = "Unable to serialize object [" + o + "]. " +