You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/29 16:13:05 UTC
[5/6] incubator-ignite git commit: ignite-950: fixes in the protocol
ignite-950: fixes in the protocol
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b380b32c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b380b32c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b380b32c
Branch: refs/heads/ignite-950
Commit: b380b32c530d038a0435930c358ada9d01339dfd
Parents: 2417c07
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri May 29 14:24:05 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri May 29 14:24:05 2015 +0300
----------------------------------------------------------------------
.../marshaller/optimized/OptimizedObjectInputStream.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b380b32c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
index d7fc802..24b756f 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
@@ -968,19 +968,19 @@ class OptimizedObjectInputStream extends ObjectInputStream {
int end = in.size() - 4;
in.offset(end);
- int footerStartOff = in.readInt();
+ int footerLen = in.readInt();
- if (footerStartOff == EMPTY_FOOTER)
+ if (footerLen == EMPTY_FOOTER)
return null; //TODO: IGNITE-950
- int pos = footerStartOff;
+ int footerStartOff = in.size() - footerLen;
in.offset(footerStartOff);
int fieldsDataPos = in.readInt();
int fieldOff = -1;
- while (pos < end) {
+ while (footerStartOff < end) {
int id = in.readInt();
if (fieldId == id) {
@@ -991,7 +991,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
// skip offset and len
in.skipBytes(8);
- pos += 12;
+ footerStartOff += 12;
}
if (fieldOff > 0) {