From c30e7cd1da84e4d251ee83aeb52c1fb842f20690 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Mon, 10 Apr 2017 12:48:53 -0400 Subject: [PATCH] ARTEMIS-1089 fixing compilation --- .../core/impl/wireformat/SessionContinuationMessage.java | 2 -- .../protocol/core/impl/wireformat/ReplicationAddMessage.java | 2 +- .../protocol/core/impl/wireformat/ReplicationAddTXMessage.java | 2 +- .../activemq/artemis/core/replication/ReplicationManager.java | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java index cd0ab91ac0..a51e627218 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java @@ -18,9 +18,7 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.util.Arrays; -import io.netty.buffer.Unpooled; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; -import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.utils.DataConstants; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java index 05a8750584..50b324fec8 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java @@ -68,7 +68,7 @@ public final class ReplicationAddMessage extends PacketImpl { DataConstants.SIZE_LONG + // buffer.writeLong(id); DataConstants.SIZE_BYTE + // buffer.writeByte(journalRecordType); DataConstants.SIZE_INT + // buffer.writeInt(persister.getEncodeSize(encodingData)); - persister.getEncodeSize(encodingData);// persister.encode(buffer, encodingData); + encodingData.getEncodeSize(); // encodingData.encode(buffer); } @Override diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java index fd686825f2..4f29c27f1a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java @@ -73,7 +73,7 @@ public class ReplicationAddTXMessage extends PacketImpl { DataConstants.SIZE_LONG + // buffer.writeLong(id); DataConstants.SIZE_BYTE + // buffer.writeByte(recordType); DataConstants.SIZE_INT + // buffer.writeInt(persister.getEncodeSize(encodingData)); - persister.getEncodeSize(encodingData); // persister.encode(buffer, encodingData); + encodingData.getEncodeSize(); // persister.encode(buffer, encodingData); } @Override diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java index 1507edb0c2..5a6c102f6c 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java @@ -41,7 +41,6 @@ import org.apache.activemq.artemis.core.journal.EncodingSupport; import org.apache.activemq.artemis.core.journal.impl.JournalFile; import org.apache.activemq.artemis.core.paging.PagedMessage; import org.apache.activemq.artemis.core.persistence.OperationContext; -import org.apache.activemq.artemis.core.persistence.Persister; import org.apache.activemq.artemis.core.persistence.impl.journal.AbstractJournalStorageManager; import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl; import org.apache.activemq.artemis.core.protocol.core.Channel;