You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/02/02 04:28:44 UTC
[52/52] [abbrv] incubator-ignite git commit: # IGNITE-61 - Fixed
compilation
# IGNITE-61 - Fixed compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7c93b5e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c93b5e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c93b5e9
Branch: refs/heads/ignite-61
Commit: 7c93b5e9def21eed8b35795035d9ed2fa0acfb3b
Parents: 3dbb6ac
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Sun Feb 1 19:26:40 2015 -0800
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Sun Feb 1 19:26:40 2015 -0800
----------------------------------------------------------------------
.../ignite/internal/GridJobExecuteRequest.java | 2 +-
.../internal/managers/GridManagerAdapter.java | 2 +-
.../managers/communication/GridIoManager.java | 19 ++++----
.../distributed/GridCacheTtlUpdateRequest.java | 50 ++++++++++----------
.../distributed/dht/GridDhtLockRequest.java | 4 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 8 ++--
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 10 ++--
.../dht/atomic/GridNearAtomicUpdateRequest.java | 4 +-
.../distributed/near/GridNearGetRequest.java | 4 +-
.../ignite/internal/util/IgniteUtils.java | 1 +
.../GridTcpCommunicationMessageAdapter.java | 5 +-
.../GridTcpCommunicationMessageState.java | 5 +-
.../internal/util/ipc/IpcToNioAdapter.java | 1 +
.../internal/util/nio/GridDirectParser.java | 5 +-
.../extensions/communication/MessageReader.java | 2 +-
.../extensions/communication/MessageWriter.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 3 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 8 ++--
.../GridTcpCommunicationByteBufferStream.java | 8 ++--
.../GridTcpCommunicationMessageReader.java | 3 +-
.../GridTcpCommunicationMessageWriter.java | 1 +
.../testframework/GridSpiTestContext.java | 13 +++--
22 files changed, 83 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
index 929f718..d26ce22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
@@ -832,7 +832,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
commState.idx++;
case 16:
- UUID subjId0 = commState.getUuid();
+ UUID subjId0 = commState.getUuid(null);
if (subjId0 == UUID_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index a5c5e47..3cb470c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -516,7 +516,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
return e != null ? (V)e.value() : null;
}
- @Override public MessageFactory messageFactory() {
+ @Override public GridTcpMessageFactory messageFactory() {
return ctx.io().messageFactory();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index b918b68..e26a124 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -21,21 +21,22 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.*;
import org.apache.ignite.internal.managers.*;
import org.apache.ignite.internal.managers.deployment.*;
import org.apache.ignite.internal.managers.eventstorage.*;
import org.apache.ignite.internal.processors.timeout.*;
+import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.direct.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.worker.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
+import org.apache.ignite.plugin.extensions.communication.*;
+import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.communication.*;
+import org.gridgain.grid.util.direct.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
@@ -138,7 +139,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
private Map<Byte, GridTcpCommunicationMessageProducer> pluginMsgs;
/** */
- private MessageFactory msgFactory;
+ private GridTcpMessageFactory msgFactory;
/** */
private MessageWriterFactory writerFactory;
@@ -200,7 +201,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
else
producers = common;
- msgFactory = new MessageFactory() {
+ msgFactory = new GridTcpMessageFactory() {
@Override public GridTcpCommunicationMessageAdapter create(byte type) {
GridTcpCommunicationMessageAdapter msg;
@@ -222,7 +223,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
};
}
- public MessageFactory messageFactory() {
+ public GridTcpMessageFactory messageFactory() {
assert msgFactory != null;
return msgFactory;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
index 615a1d4..6b0fa97 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
@@ -201,7 +201,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
return false;
if (!commState.typeWritten) {
- if (!commState.putByte(directType()))
+ if (!commState.putByte(null, directType()))
return false;
commState.typeWritten = true;
@@ -211,7 +211,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
case 3:
if (keysBytes != null) {
if (commState.it == null) {
- if (!commState.putInt(keysBytes.size()))
+ if (!commState.putInt(null, keysBytes.size()))
return false;
commState.it = keysBytes.iterator();
@@ -221,7 +221,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
if (commState.cur == NULL)
commState.cur = commState.it.next();
- if (!commState.putByteArray((byte[])commState.cur))
+ if (!commState.putByteArray(null, (byte[])commState.cur))
return false;
commState.cur = NULL;
@@ -229,7 +229,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
commState.it = null;
} else {
- if (!commState.putInt(-1))
+ if (!commState.putInt(null, -1))
return false;
}
@@ -238,7 +238,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
case 4:
if (nearKeysBytes != null) {
if (commState.it == null) {
- if (!commState.putInt(nearKeysBytes.size()))
+ if (!commState.putInt(null, nearKeysBytes.size()))
return false;
commState.it = nearKeysBytes.iterator();
@@ -248,7 +248,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
if (commState.cur == NULL)
commState.cur = commState.it.next();
- if (!commState.putByteArray((byte[])commState.cur))
+ if (!commState.putByteArray(null, (byte[])commState.cur))
return false;
commState.cur = NULL;
@@ -256,7 +256,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
commState.it = null;
} else {
- if (!commState.putInt(-1))
+ if (!commState.putInt(null, -1))
return false;
}
@@ -265,7 +265,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
case 5:
if (nearVers != null) {
if (commState.it == null) {
- if (!commState.putInt(nearVers.size()))
+ if (!commState.putInt(null, nearVers.size()))
return false;
commState.it = nearVers.iterator();
@@ -275,7 +275,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
if (commState.cur == NULL)
commState.cur = commState.it.next();
- if (!commState.putCacheVersion((GridCacheVersion)commState.cur))
+ if (!commState.putCacheVersion(null, (GridCacheVersion)commState.cur))
return false;
commState.cur = NULL;
@@ -283,20 +283,20 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
commState.it = null;
} else {
- if (!commState.putInt(-1))
+ if (!commState.putInt(null, -1))
return false;
}
commState.idx++;
case 6:
- if (!commState.putLong(topVer))
+ if (!commState.putLong(null, topVer))
return false;
commState.idx++;
case 7:
- if (!commState.putLong(ttl))
+ if (!commState.putLong(null, ttl))
return false;
commState.idx++;
@@ -304,7 +304,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
case 8:
if (vers != null) {
if (commState.it == null) {
- if (!commState.putInt(vers.size()))
+ if (!commState.putInt(null, vers.size()))
return false;
commState.it = vers.iterator();
@@ -314,7 +314,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
if (commState.cur == NULL)
commState.cur = commState.it.next();
- if (!commState.putCacheVersion((GridCacheVersion)commState.cur))
+ if (!commState.putCacheVersion(null, (GridCacheVersion)commState.cur))
return false;
commState.cur = NULL;
@@ -322,7 +322,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
commState.it = null;
} else {
- if (!commState.putInt(-1))
+ if (!commState.putInt(null, -1))
return false;
}
@@ -346,7 +346,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
if (buf.remaining() < 4)
return false;
- commState.readSize = commState.getInt();
+ commState.readSize = commState.getInt(null);
}
if (commState.readSize >= 0) {
@@ -354,7 +354,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
keysBytes = new ArrayList<>(commState.readSize);
for (int i = commState.readItems; i < commState.readSize; i++) {
- byte[] _val = commState.getByteArray();
+ byte[] _val = commState.getByteArray(null);
if (_val == BYTE_ARR_NOT_READ)
return false;
@@ -375,7 +375,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
if (buf.remaining() < 4)
return false;
- commState.readSize = commState.getInt();
+ commState.readSize = commState.getInt(null);
}
if (commState.readSize >= 0) {
@@ -383,7 +383,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
nearKeysBytes = new ArrayList<>(commState.readSize);
for (int i = commState.readItems; i < commState.readSize; i++) {
- byte[] _val = commState.getByteArray();
+ byte[] _val = commState.getByteArray(null);
if (_val == BYTE_ARR_NOT_READ)
return false;
@@ -404,7 +404,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
if (buf.remaining() < 4)
return false;
- commState.readSize = commState.getInt();
+ commState.readSize = commState.getInt(null);
}
if (commState.readSize >= 0) {
@@ -412,7 +412,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
nearVers = new ArrayList<>(commState.readSize);
for (int i = commState.readItems; i < commState.readSize; i++) {
- GridCacheVersion _val = commState.getCacheVersion();
+ GridCacheVersion _val = commState.getCacheVersion(null);
if (_val == CACHE_VER_NOT_READ)
return false;
@@ -432,7 +432,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
if (buf.remaining() < 8)
return false;
- topVer = commState.getLong();
+ topVer = commState.getLong(null);
commState.idx++;
@@ -440,7 +440,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
if (buf.remaining() < 8)
return false;
- ttl = commState.getLong();
+ ttl = commState.getLong(null);
commState.idx++;
@@ -449,7 +449,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
if (buf.remaining() < 4)
return false;
- commState.readSize = commState.getInt();
+ commState.readSize = commState.getInt(null);
}
if (commState.readSize >= 0) {
@@ -457,7 +457,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
vers = new ArrayList<>(commState.readSize);
for (int i = commState.readItems; i < commState.readSize; i++) {
- GridCacheVersion _val = commState.getCacheVersion();
+ GridCacheVersion _val = commState.getCacheVersion(null);
if (_val == CACHE_VER_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index b5fe8b3..8ed9715 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -458,7 +458,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
commState.idx++;
case 32:
- if (!commState.putLong(accessTtl))
+ if (!commState.putLong(null, accessTtl))
return false;
commState.idx++;
@@ -566,7 +566,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
if (buf.remaining() < 8)
return false;
- accessTtl = commState.getLong();
+ accessTtl = commState.getLong(null);
commState.idx++;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 30987df..c394cf6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -506,13 +506,13 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
commState.idx++;
case 32:
- if (!commState.putLongList(ttls))
+ if (!commState.putLongList(null, ttls))
return false;
commState.idx++;
case 33:
- if (!commState.putLongList(nearTtls))
+ if (!commState.putLongList(null, nearTtls))
return false;
commState.idx++;
@@ -664,7 +664,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
commState.idx++;
case 32:
- GridLongList ttls0 = commState.getLongList();
+ GridLongList ttls0 = commState.getLongList(null);
if (ttls0 == LONG_LIST_NOT_READ)
return false;
@@ -674,7 +674,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
commState.idx++;
case 33:
- GridLongList nearTtls0 = commState.getLongList();
+ GridLongList nearTtls0 = commState.getLongList(null);
if (nearTtls0 == LONG_LIST_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 6f7ce44..baf929b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -866,13 +866,13 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
commState.idx++;
case 12:
- if (!commState.putLong(topVer))
+ if (!commState.putLong(null, topVer))
return false;
commState.idx++;
case 13:
- if (!commState.putLongList(ttls))
+ if (!commState.putLongList(null, ttls))
return false;
commState.idx++;
@@ -1100,7 +1100,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
if (buf.remaining() < 4)
return false;
- commState.readSize = commState.getInt();
+ commState.readSize = commState.getInt(null);
}
if (commState.readSize >= 0) {
@@ -1154,7 +1154,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
commState.idx++;
case 8:
- GridLongList nearExpireTimes0 = commState.getLongList();
+ GridLongList nearExpireTimes0 = commState.getLongList(null);
if (nearExpireTimes0 == LONG_LIST_NOT_READ)
return false;
@@ -1164,7 +1164,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
commState.idx++;
case 9:
- GridLongList nearTtls0 = commState.getLongList();
+ GridLongList nearTtls0 = commState.getLongList(null);
if (nearTtls0 == LONG_LIST_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index e095e1f..e27065e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -955,7 +955,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
invokeArgsBytes = new byte[commState.readSize][];
for (int i = commState.readItems; i < commState.readSize; i++) {
- byte[] _val = commState.getByteArray();
+ byte[] _val = commState.getByteArray(null);
if (_val == BYTE_ARR_NOT_READ)
return false;
@@ -976,7 +976,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
if (buf.remaining() < 4)
return false;
- commState.readSize = commState.getInt();
+ commState.readSize = commState.getInt(null);
}
if (commState.readSize >= 0) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index 2a51d59..033e793 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -297,7 +297,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
switch (commState.idx) {
case 3:
- if (!commState.putLong(accessTtl))
+ if (!commState.putLong(null, accessTtl))
return false;
commState.idx++;
@@ -433,7 +433,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
if (buf.remaining() < 8)
return false;
- accessTtl = commState.getLong();
+ accessTtl = commState.getLong(null);
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 5ba3403..75939e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -27,6 +27,7 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.mxbean.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.util.direct.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.lifecycle.*;
import org.apache.ignite.portables.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java
index 822c0bc..3580cb7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java
@@ -18,11 +18,12 @@
package org.apache.ignite.internal.util.direct;
import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.clock.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.clock.*;
+import org.apache.ignite.plugin.extensions.communication.*;
import java.io.*;
import java.nio.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java b/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java
index 85717e4..44b22ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java
@@ -18,11 +18,12 @@
package org.apache.ignite.internal.util.direct;
import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.clock.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.clock.*;
+import org.apache.ignite.plugin.extensions.communication.*;
import org.jetbrains.annotations.*;
import sun.misc.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
index d9daba6..043e2bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.util.ipc;
import org.apache.ignite.*;
import org.apache.ignite.internal.util.direct.*;
import org.apache.ignite.internal.util.nio.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
import java.nio.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
index 350d0b1..b87236c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
@@ -18,9 +18,8 @@
package org.apache.ignite.internal.util.nio;
import org.apache.ignite.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.*;
import org.apache.ignite.internal.util.direct.*;
+import org.apache.ignite.spi.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -37,7 +36,7 @@ public class GridDirectParser implements GridNioParser {
private IgniteSpiAdapter spi;
/** */
- private MessageFactory msgFactory;
+ private GridTcpMessageFactory msgFactory;
/**
* @param spi Spi.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java
index dc2bee8..1431738 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java
@@ -9,8 +9,8 @@
package org.apache.ignite.plugin.extensions.communication;
+import org.apache.ignite.internal.util.direct.*;
import org.apache.ignite.plugin.*;
-import org.gridgain.grid.util.direct.*;
import java.nio.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
index ce0b249..125c84c 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
@@ -9,8 +9,8 @@
package org.apache.ignite.plugin.extensions.communication;
+import org.apache.ignite.internal.util.direct.*;
import org.apache.ignite.plugin.*;
-import org.gridgain.grid.util.direct.*;
import java.nio.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 892c0de..4b07a0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.util.direct.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.spi.authentication.*;
import org.apache.ignite.internal.managers.communication.*;
@@ -727,7 +728,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
}
/** {@inheritDoc} */
- @Override public MessageFactory messageFactory() {
+ @Override public GridTcpMessageFactory messageFactory() {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
index 822dae7..af4c54a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
@@ -20,11 +20,11 @@ package org.apache.ignite.spi;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.spi.swapspace.*;
import org.apache.ignite.internal.managers.communication.*;
import org.apache.ignite.internal.managers.eventstorage.*;
+import org.apache.ignite.internal.util.direct.*;
+import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.spi.swapspace.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -399,5 +399,5 @@ public interface IgniteSpiContext {
/**
* @return Message factory.
*/
- public MessageFactory messageFactory();
+ public GridTcpMessageFactory messageFactory();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationByteBufferStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationByteBufferStream.java b/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationByteBufferStream.java
index 0de1ea3..85ce982 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationByteBufferStream.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationByteBufferStream.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.util.direct;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.gridgain.grid.util.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.direct.*;
import org.jetbrains.annotations.*;
import sun.misc.*;
import sun.nio.ch.*;
@@ -193,7 +193,7 @@ public class GridTcpCommunicationByteBufferStream {
};
/** */
- private final MessageFactory msgFactory;
+ private final GridTcpMessageFactory msgFactory;
/** */
private ByteBuffer buf;
@@ -228,7 +228,7 @@ public class GridTcpCommunicationByteBufferStream {
/**
* @param msgFactory Message factory.
*/
- public GridTcpCommunicationByteBufferStream(@Nullable MessageFactory msgFactory) {
+ public GridTcpCommunicationByteBufferStream(@Nullable GridTcpMessageFactory msgFactory) {
this.msgFactory = msgFactory;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationMessageReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationMessageReader.java b/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationMessageReader.java
index 1645fb5..278beca 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationMessageReader.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationMessageReader.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.util.direct;
+import org.apache.ignite.internal.util.direct.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.jetbrains.annotations.*;
@@ -27,7 +28,7 @@ public class GridTcpCommunicationMessageReader implements MessageReader {
/**
* @param msgFactory Message factory.
*/
- public GridTcpCommunicationMessageReader(MessageFactory msgFactory) {
+ public GridTcpCommunicationMessageReader(GridTcpMessageFactory msgFactory) {
this.stream = new GridTcpCommunicationByteBufferStream(msgFactory);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationMessageWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationMessageWriter.java b/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationMessageWriter.java
index 101015c..82ad4f8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationMessageWriter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/direct/GridTcpCommunicationMessageWriter.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.util.direct;
+import org.apache.ignite.internal.util.direct.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.jetbrains.annotations.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c93b5e9/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
index 6b5003f..4bba5eb 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
@@ -21,15 +21,14 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.swapspace.*;
import org.apache.ignite.internal.managers.communication.*;
import org.apache.ignite.internal.managers.eventstorage.*;
import org.apache.ignite.internal.util.direct.*;
import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.swapspace.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -518,8 +517,8 @@ public class GridSpiTestContext implements IgniteSpiContext {
}
/** {@inheritDoc} */
- @Override public MessageFactory messageFactory() {
- return new MessageFactory() {
+ @Override public GridTcpMessageFactory messageFactory() {
+ return new GridTcpMessageFactory() {
@Override public GridTcpCommunicationMessageAdapter create(byte type) {
return GridTcpCommunicationMessageFactory.create(type);
}