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 2017/04/10 16:53:09 UTC
activemq-artemis git commit: ARTEMIS-1089 fixing compilation
Repository: activemq-artemis
Updated Branches:
refs/heads/1.x 8a4a30765 -> c30e7cd1d
ARTEMIS-1089 fixing compilation
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c30e7cd1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c30e7cd1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c30e7cd1
Branch: refs/heads/1.x
Commit: c30e7cd1da84e4d251ee83aeb52c1fb842f20690
Parents: 8a4a307
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Apr 10 12:48:53 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Apr 10 12:50:15 2017 -0400
----------------------------------------------------------------------
.../protocol/core/impl/wireformat/SessionContinuationMessage.java | 2 --
.../core/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c30e7cd1/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java
----------------------------------------------------------------------
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 cd0ab91..a51e627 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;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c30e7cd1/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java
----------------------------------------------------------------------
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 05a8750..50b324f 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
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c30e7cd1/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java
----------------------------------------------------------------------
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 fd68682..4f29c27 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
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c30e7cd1/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
----------------------------------------------------------------------
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 1507edb..5a6c102 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;