You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/03/14 18:56:36 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1743 fix NPE in server log
when Artemis trace logging is enabled
Repository: activemq-artemis
Updated Branches:
refs/heads/master a00245dd0 -> 2383c22f0
ARTEMIS-1743 fix NPE in server log when Artemis trace logging is enabled
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/84a098a4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/84a098a4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/84a098a4
Branch: refs/heads/master
Commit: 84a098a4f4901732d347533ef0ee3a16d8ccd68e
Parents: a00245d
Author: Stanislav Knot <sk...@redhat.com>
Authored: Tue Mar 13 12:19:01 2018 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Mar 14 14:56:29 2018 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/core/message/impl/CoreMessage.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/84a098a4/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
index 2c570b9..5ed46cd 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -644,8 +644,11 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
@Override
public int getEncodeSize() {
+ if (buffer == null) {
+ return -1;
+ }
checkEncode();
- return buffer == null ? -1 : buffer.writerIndex();
+ return buffer.writerIndex();
}
@Override
[2/2] activemq-artemis git commit: This closes #1952
Posted by cl...@apache.org.
This closes #1952
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2383c22f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2383c22f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2383c22f
Branch: refs/heads/master
Commit: 2383c22f0e0c70138c55d2cd6ea3775f3fa4c4f8
Parents: a00245d 84a098a
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Mar 14 14:56:30 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Mar 14 14:56:30 2018 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/core/message/impl/CoreMessage.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------