[activemq-artemis] branch master updated: ARTEMIS-2450 Fixing page-size Nullable Long encoding

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 7496dc6  ARTEMIS-2450 Fixing page-size Nullable Long encoding
7496dc6 is described below

commit 7496dc68292cacbfaae1a03453a4f8c7b155f28f
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Wed Aug 21 14:37:54 2019 -0400

    ARTEMIS-2450 Fixing page-size Nullable Long encoding
---
 .../apache/activemq/artemis/core/settings/impl/AddressSettings.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java
index b864c6f..cb5d0b3 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java
@@ -1047,7 +1047,7 @@ public class AddressSettings implements 
Mergeable<AddressSettings>, Serializable
 
       return BufferHelper.sizeOfNullableSimpleString(addressFullMessagePolicy 
!= null ? addressFullMessagePolicy.toString() : null) +
          BufferHelper.sizeOfNullableLong(maxSizeBytes) +
-         BufferHelper.sizeOfNullableLong(Long.valueOf(pageSizeBytes)) +
+         BufferHelper.sizeOfNullableLong(pageSizeBytes == null ? null : 
Long.valueOf(pageSizeBytes)) +
          BufferHelper.sizeOfNullableInteger(pageMaxCache) +
          BufferHelper.sizeOfNullableBoolean(dropMessagesWhenFull) +
          BufferHelper.sizeOfNullableInteger(maxDeliveryAttempts) +
@@ -1098,7 +1098,7 @@ public class AddressSettings implements 
Mergeable<AddressSettings>, Serializable
 
       BufferHelper.writeNullableLong(buffer, maxSizeBytes);
 
-      BufferHelper.writeNullableLong(buffer, Long.valueOf(pageSizeBytes));
+      BufferHelper.writeNullableLong(buffer, pageSizeBytes == null ? null : 
Long.valueOf(pageSizeBytes));
 
       BufferHelper.writeNullableInteger(buffer, pageMaxCache);