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/aca1d3c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aca1d3c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aca1d3c4

Branch: refs/heads/ignite-471
Commit: aca1d3c4ab42a9395293fbbfd9af0131692ebd36
Parents: b90f447
Author: Valentin Kulichenko <[email protected]>
Authored: Thu Mar 12 15:35:01 2015 -0700
Committer: Valentin Kulichenko <[email protected]>
Committed: Thu Mar 12 15:35:01 2015 -0700

----------------------------------------------------------------------
 .../src/test/java/org/apache/ignite/gridify/AbstractAopTest.java | 4 ++--
 .../ignite/internal/util/io/GridByteBufferInputStream.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aca1d3c4/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
----------------------------------------------------------------------
diff --git 
a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java 
b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
index f8c5d55..4a86f24 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
@@ -419,8 +419,8 @@ public abstract class AbstractAopTest extends 
GridCommonAbstractTest {
 
             assert res == 1 : "Method gridifyDefault returned wrong value 
[result=" + res + ", expected=1]";
 
-            assert locDepCnt.get() == 8 : "Invalid local deployment count 
[expected=8, got=" + locDepCnt.get() + ']';
-            assert rmtDepCnt.get() == 7 : "Invalid remote deployment count 
[expected=7, got=" + rmtDepCnt.get() + ']';
+            assert locDepCnt.get() == 5 : "Invalid local deployment count 
[expected=5, got=" + locDepCnt.get() + ']';
+            assert rmtDepCnt.get() == 5 : "Invalid remote deployment count 
[expected=5, got=" + rmtDepCnt.get() + ']';
         }
         finally {
             stopAllGrids();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aca1d3c4/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteBufferInputStream.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteBufferInputStream.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteBufferInputStream.java
index cc8e067..81c620c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteBufferInputStream.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteBufferInputStream.java
@@ -31,7 +31,7 @@ public class GridByteBufferInputStream extends InputStream {
      * @param buf Byte buffer.
      */
     public GridByteBufferInputStream(ByteBuffer buf) {
-        this.buf = buf;
+        this.buf = buf.asReadOnlyBuffer();
     }
 
     /** {@inheritDoc} */

Reply via email to