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:02 UTC
[2/6] incubator-ignite git commit: ignite-950: adjusting footer format
ignite-950: adjusting footer format
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3148af7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3148af7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3148af7a
Branch: refs/heads/ignite-950
Commit: 3148af7a912935ae3d526b7bc466cbe49c9e952f
Parents: f70d39a
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri May 29 12:54:19 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri May 29 12:54:19 2015 +0300
----------------------------------------------------------------------
.../marshaller/optimized/OptimizedMarshallerUtils.java | 3 ---
.../marshaller/optimized/OptimizedObjectInputStream.java | 8 +++-----
2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3148af7a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
index dd13ac5..6e7f6c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
@@ -144,9 +144,6 @@ class OptimizedMarshallerUtils {
static final byte SERIALIZABLE = 102;
/** */
- static final byte FOOTER_START = 1;
-
- /** */
static final byte EMPTY_FOOTER = -1;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3148af7a/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 f854dca..d07aaf5 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
@@ -520,10 +520,8 @@ class OptimizedObjectInputStream extends ObjectInputStream {
byte flag = (byte)in.readInt();
- assert flag == EMPTY_FOOTER || flag == FOOTER_START;
-
- if (flag == FOOTER_START) {
- int skip = 2;
+ if (flag != EMPTY_FOOTER) {
+ int skip = 3;
for (int i = 0; i < fields.hierarchyLevels(); i++)
skip += fields.fields(i).size() * 3;
@@ -962,7 +960,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
int pos = footerStartOff;
in.offset(footerStartOff);
- assert in.readInt() == FOOTER_START;
+ //assert in.readInt() == FOOTER_START;
in.readInt(); //TODO: do I need this? skip fields start offset
int fieldOff = -1;