IGNITE-471 - Marshalling fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c91d0af9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c91d0af9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c91d0af9 Branch: refs/heads/ignite-471 Commit: c91d0af9c6297c3f39efab761880aec3bca43d12 Parents: e574923 Author: Valentin Kulichenko <[email protected]> Authored: Thu Mar 12 18:02:05 2015 -0700 Committer: Valentin Kulichenko <[email protected]> Committed: Thu Mar 12 18:02:05 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/codegen/MessageCodeGenerator.java | 2 +- .../internal/processors/cache/CacheEntryPredicateAdapter.java | 2 ++ .../apache/ignite/marshaller/optimized/OptimizedMarshaller.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c91d0af9/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java index 430c902..185448a 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java @@ -299,7 +299,7 @@ public class MessageCodeGenerator { for (Field field : declaredFields) { int mod = field.getModifiers(); - if (!isStatic(mod) && !isTransient(mod) && !field.isAnnotationPresent(GridDirectTransient.class)) + if (!isStatic(mod) && !field.isAnnotationPresent(GridDirectTransient.class)) fields.add(field); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c91d0af9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java index c5b20b4..c68e9e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.plugin.extensions.communication.*; import org.jetbrains.annotations.*; @@ -28,6 +29,7 @@ import java.nio.*; */ public abstract class CacheEntryPredicateAdapter implements CacheEntryPredicate { /** */ + @GridDirectTransient protected transient boolean locked; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c91d0af9/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java index 9c788e2..cad066b 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java @@ -78,7 +78,7 @@ import java.nio.*; public class OptimizedMarshaller extends AbstractMarshaller { /** Initial buffer size. */ // TODO: IGNITE-471 - Make configurable - private static final int INIT_BUF_SIZE = 256; + private static final int INIT_BUF_SIZE = 64; /** Default class loader. */ private final ClassLoader dfltClsLdr = getClass().getClassLoader();
