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/08/14 16:41:33 UTC
[2/2] activemq-artemis git commit: ARTEMIS-2023 Fix NPE
ARTEMIS-2023 Fix NPE
(cherry picked from commit 4c51848b58fc14bd63ba0a764c31d3ca1dbffc5e)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/62e1d7ec
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/62e1d7ec
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/62e1d7ec
Branch: refs/heads/2.6.x
Commit: 62e1d7ec52101fa7062ff3a4ea37eb4b6dcd8b58
Parents: d183070
Author: Michael André Pearce <mi...@me.com>
Authored: Tue Aug 14 07:04:06 2018 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Aug 14 12:41:25 2018 -0400
----------------------------------------------------------------------
.../jms/server/config/impl/ConnectionFactoryConfigurationImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/62e1d7ec/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
index ae71eca..c2ac0b6 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
@@ -640,7 +640,7 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
deserializationWhiteList = BufferHelper.readNullableSimpleStringAsString(buffer);
- enable1xPrefixes = buffer.readableBytes() > 0 ? buffer.readBoolean() : null;
+ enable1xPrefixes = buffer.readableBytes() > 0 ? buffer.readBoolean() : ActiveMQClient.DEFAULT_ENABLE_1X_PREFIXES;
enableSharedClientID = buffer.readableBytes() > 0 ? buffer.readBoolean() : ActiveMQClient.DEFAULT_ENABLED_SHARED_CLIENT_ID;