From 45b1eeb56f6a803fc2ee48551c3246eb352d10f1 Mon Sep 17 00:00:00 2001 From: Eliran Bivas Date: Tue, 6 Dec 2016 11:27:05 +0200 Subject: [PATCH 1/2] getMsg fix for NullPointerException --- src/java/org/accelio/jxio/MsgPool.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/java/org/accelio/jxio/MsgPool.java b/src/java/org/accelio/jxio/MsgPool.java index 2bf4009..217f778 100644 --- a/src/java/org/accelio/jxio/MsgPool.java +++ b/src/java/org/accelio/jxio/MsgPool.java @@ -140,7 +140,9 @@ public Msg getMsg() { return null; } Msg msg = listMsg.poll(); - msg.setMsgReturnable(); + if (msg != null) { + msg.setMsgReturnable(); + } return msg; } From 24835fb6265bda3226f0a14e8b1c6c806913a08e Mon Sep 17 00:00:00 2001 From: Eliran Bivas Date: Sun, 15 Jan 2017 17:52:44 +0200 Subject: [PATCH 2/2] indent --- src/java/org/accelio/jxio/MsgPool.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/org/accelio/jxio/MsgPool.java b/src/java/org/accelio/jxio/MsgPool.java index 217f778..dd14d81 100644 --- a/src/java/org/accelio/jxio/MsgPool.java +++ b/src/java/org/accelio/jxio/MsgPool.java @@ -140,9 +140,9 @@ public Msg getMsg() { return null; } Msg msg = listMsg.poll(); - if (msg != null) { - msg.setMsgReturnable(); - } + if (msg != null) { + msg.setMsgReturnable(); + } return msg; }