ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [21/50] [abbrv] incubator-ignite git commit: # IGNITE-141 - Fixing tests
Date Wed, 11 Mar 2015 00:56:49 GMT
# IGNITE-141 - Fixing tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/94c68388
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/94c68388
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/94c68388

Branch: refs/heads/sprint-2
Commit: 94c683889eed397753c6d50fbfc6ffa89818b891
Parents: 71be6c6
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Thu Mar 5 18:54:36 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Thu Mar 5 18:54:36 2015 -0800

----------------------------------------------------------------------
 .../apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java  | 10 ++++++++--
 .../checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java   |  2 +-
 .../ignite/marshaller/MarshallerContextTestImpl.java      |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/94c68388/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index b5198f6..8251d30 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -27,6 +27,8 @@ import org.apache.ignite.internal.util.*;
 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.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.checkpoint.*;
@@ -122,6 +124,10 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi,
     /** Suffix to use in bucket name generation. */
     public static final String DFLT_BUCKET_NAME_SUFFIX = "default-bucket";
 
+    /** Marshaller. */
+    @GridToStringExclude
+    private final Marshaller marsh = new JdkMarshaller();
+
     /** Client to interact with S3 storage. */
     @GridToStringExclude
     private AmazonS3 s3;
@@ -458,7 +464,7 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi,
             InputStream in = obj.getObjectContent();
 
             try {
-                return ignite.configuration().getMarshaller().unmarshal(in, U.gridClassLoader());
+                return marsh.unmarshal(in, U.gridClassLoader());
             }
             finally {
                 U.closeQuiet(in);
@@ -486,7 +492,7 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi,
         if (log.isDebugEnabled())
             log.debug("Writing data to S3 [bucket=" + bucketName + ", key=" + data.getKey()
+ ']');
 
-        byte[] buf = ignite.configuration().getMarshaller().marshal(data);
+        byte[] buf = marsh.marshal(data);
 
         ObjectMetadata meta = new ObjectMetadata();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/94c68388/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
index ceaf64f..7de2124 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
@@ -34,7 +34,7 @@ public class S3CheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTe
 
         spi.setAwsCredentials(cred);
 
-        spi.setBucketNameSuffix("test");
+        spi.setBucketNameSuffix("test-bucket");
 
         super.spiConfigure(spi);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/94c68388/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java
b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java
index 52d49bd..abff9b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java
@@ -79,7 +79,7 @@ public class MarshallerContextTestImpl implements MarshallerContext {
     @Override public Class className(int id, ClassLoader ldr) throws ClassNotFoundException
{
         Class cls = map.get(id);
 
-        assert cls != null;
+        assert cls != null : id;
 
         return cls;
     }


Mime
View raw message