Skip to content

Commit

Permalink
# IGNITE-61 - Fixed compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
Valentin Kulichenko committed Feb 2, 2015
1 parent 3dbb6ac commit 7c93b5e
Show file tree
Hide file tree
Showing 22 changed files with 83 additions and 77 deletions.
2 changes: 1 addition & 1 deletion modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
View file
Expand Up @@ -832,7 +832,7 @@ public UUID getSubjectId() {
commState.idx++;

case 16:
UUID subjId0 = commState.getUuid();
UUID subjId0 = commState.getUuid(null);

if (subjId0 == UUID_NOT_READ)
return false;
Expand Down
2 changes: 1 addition & 1 deletion modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
View file
Expand Up @@ -516,7 +516,7 @@ protected final String stopInfo() {
return e != null ? (V)e.value() : null;
}

@Override public MessageFactory messageFactory() {
@Override public GridTcpMessageFactory messageFactory() {
return ctx.io().messageFactory();
}

Expand Down
19 changes: 10 additions & 9 deletions ...s/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
View file
Expand Up @@ -21,21 +21,22 @@
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.*;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -200,7 +201,7 @@ public void initMessageFactory() {
else
producers = common;

msgFactory = new MessageFactory() {
msgFactory = new GridTcpMessageFactory() {
@Override public GridTcpCommunicationMessageAdapter create(byte type) {
GridTcpCommunicationMessageAdapter msg;

Expand All @@ -222,7 +223,7 @@ public void initMessageFactory() {
};
}

public MessageFactory messageFactory() {
public GridTcpMessageFactory messageFactory() {
assert msgFactory != null;

return msgFactory;
Expand Down
50 changes: 25 additions & 25 deletions ...va/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
View file
Expand Up @@ -201,7 +201,7 @@ public List<GridCacheVersion > nearVersions() {
return false;

if (!commState.typeWritten) {
if (!commState.putByte(directType()))
if (!commState.putByte(null, directType()))
return false;

commState.typeWritten = true;
Expand All @@ -211,7 +211,7 @@ public List<GridCacheVersion > nearVersions() {
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();
Expand All @@ -221,15 +221,15 @@ public List<GridCacheVersion > nearVersions() {
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;
}

commState.it = null;
} else {
if (!commState.putInt(-1))
if (!commState.putInt(null, -1))
return false;
}

Expand All @@ -238,7 +238,7 @@ public List<GridCacheVersion > nearVersions() {
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();
Expand All @@ -248,15 +248,15 @@ public List<GridCacheVersion > nearVersions() {
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;
}

commState.it = null;
} else {
if (!commState.putInt(-1))
if (!commState.putInt(null, -1))
return false;
}

Expand All @@ -265,7 +265,7 @@ public List<GridCacheVersion > nearVersions() {
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();
Expand All @@ -275,36 +275,36 @@ public List<GridCacheVersion > nearVersions() {
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;
}

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++;

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();
Expand All @@ -314,15 +314,15 @@ public List<GridCacheVersion > nearVersions() {
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;
}

commState.it = null;
} else {
if (!commState.putInt(-1))
if (!commState.putInt(null, -1))
return false;
}

Expand All @@ -346,15 +346,15 @@ public List<GridCacheVersion > nearVersions() {
if (buf.remaining() < 4)
return false;

commState.readSize = commState.getInt();
commState.readSize = commState.getInt(null);
}

if (commState.readSize >= 0) {
if (keysBytes == null)
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;
Expand All @@ -375,15 +375,15 @@ public List<GridCacheVersion > nearVersions() {
if (buf.remaining() < 4)
return false;

commState.readSize = commState.getInt();
commState.readSize = commState.getInt(null);
}

if (commState.readSize >= 0) {
if (nearKeysBytes == null)
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;
Expand All @@ -404,15 +404,15 @@ public List<GridCacheVersion > nearVersions() {
if (buf.remaining() < 4)
return false;

commState.readSize = commState.getInt();
commState.readSize = commState.getInt(null);
}

if (commState.readSize >= 0) {
if (nearVers == null)
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;
Expand All @@ -432,15 +432,15 @@ public List<GridCacheVersion > nearVersions() {
if (buf.remaining() < 8)
return false;

topVer = commState.getLong();
topVer = commState.getLong(null);

commState.idx++;

case 7:
if (buf.remaining() < 8)
return false;

ttl = commState.getLong();
ttl = commState.getLong(null);

commState.idx++;

Expand All @@ -449,15 +449,15 @@ public List<GridCacheVersion > nearVersions() {
if (buf.remaining() < 4)
return false;

commState.readSize = commState.getInt();
commState.readSize = commState.getInt(null);
}

if (commState.readSize >= 0) {
if (vers == null)
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;
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
View file
Expand Up @@ -458,7 +458,7 @@ public long accessTtl() {
commState.idx++;

case 32:
if (!commState.putLong(accessTtl))
if (!commState.putLong(null, accessTtl))
return false;

commState.idx++;
Expand Down Expand Up @@ -566,7 +566,7 @@ public long accessTtl() {
if (buf.remaining() < 8)
return false;

accessTtl = commState.getLong();
accessTtl = commState.getLong(null);

commState.idx++;
}
Expand Down
8 changes: 4 additions & 4 deletions ...a/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
View file
Expand Up @@ -506,13 +506,13 @@ public GridLongList nearTtls() {
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++;
Expand Down Expand Up @@ -664,7 +664,7 @@ public GridLongList nearTtls() {
commState.idx++;

case 32:
GridLongList ttls0 = commState.getLongList();
GridLongList ttls0 = commState.getLongList(null);

if (ttls0 == LONG_LIST_NOT_READ)
return false;
Expand All @@ -674,7 +674,7 @@ public GridLongList nearTtls() {
commState.idx++;

case 33:
GridLongList nearTtls0 = commState.getLongList();
GridLongList nearTtls0 = commState.getLongList(null);

if (nearTtls0 == LONG_LIST_NOT_READ)
return false;
Expand Down
10 changes: 5 additions & 5 deletions ...e/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
View file
Expand Up @@ -866,13 +866,13 @@ public long nearExpireTime(int idx) {
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++;
Expand Down Expand Up @@ -1100,7 +1100,7 @@ public long nearExpireTime(int idx) {
if (buf.remaining() < 4)
return false;

commState.readSize = commState.getInt();
commState.readSize = commState.getInt(null);
}

if (commState.readSize >= 0) {
Expand Down Expand Up @@ -1154,7 +1154,7 @@ public long nearExpireTime(int idx) {
commState.idx++;

case 8:
GridLongList nearExpireTimes0 = commState.getLongList();
GridLongList nearExpireTimes0 = commState.getLongList(null);

if (nearExpireTimes0 == LONG_LIST_NOT_READ)
return false;
Expand All @@ -1164,7 +1164,7 @@ public long nearExpireTime(int idx) {
commState.idx++;

case 9:
GridLongList nearTtls0 = commState.getLongList();
GridLongList nearTtls0 = commState.getLongList(null);

if (nearTtls0 == LONG_LIST_NOT_READ)
return false;
Expand Down

0 comments on commit 7c93b5e

Please sign in to comment.