[infinispan-commits] Infinispan SVN: r2443 - in branches/4.2.x: cachestore/cloud/src/main/java/org/infinispan/loaders/cloud and 1 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Sep 27 12:39:21 EDT 2010
Author: galder.zamarreno at jboss.com
Date: 2010-09-27 12:39:21 -0400 (Mon, 27 Sep 2010)
New Revision: 2443
Modified:
branches/4.2.x/cachestore/cloud/pom.xml
branches/4.2.x/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java
branches/4.2.x/parent/pom.xml
Log:
ISPN-660 - Upgrade to jclouds 1.0-beta-7 - Merged in rev 2424 and 2430 from trunk.
Modified: branches/4.2.x/cachestore/cloud/pom.xml
===================================================================
--- branches/4.2.x/cachestore/cloud/pom.xml 2010-09-27 15:39:20 UTC (rev 2442)
+++ branches/4.2.x/cachestore/cloud/pom.xml 2010-09-27 16:39:21 UTC (rev 2443)
@@ -39,22 +39,10 @@
<!-- optional cloud provider plug-ins. You'd need at least one! -->
<dependency>
<groupId>org.jclouds</groupId>
- <artifactId>jclouds-aws</artifactId>
+ <artifactId>jclouds-allblobstore</artifactId>
<version>${version.jclouds}</version>
<scope>optional</scope>
</dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-azure</artifactId>
- <version>${version.jclouds}</version>
- <scope>optional</scope>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-rackspace</artifactId>
- <version>${version.jclouds}</version>
- <scope>optional</scope>
- </dependency>
<!-- =========================================================== -->
@@ -64,18 +52,6 @@
<version>${version.commons.compress}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava-collections</artifactId>
- <version>${version.guava}</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava-base</artifactId>
- <version>${version.guava}</version>
- </dependency>
-
</dependencies>
<build>
Modified: branches/4.2.x/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java
===================================================================
--- branches/4.2.x/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java 2010-09-27 15:39:20 UTC (rev 2442)
+++ branches/4.2.x/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java 2010-09-27 16:39:21 UTC (rev 2443)
@@ -164,7 +164,7 @@
blobStore.createContainerInLocation(chosenLoc, containerName);
}
pollFutures = !cfg.getAsyncStoreConfig().isEnabled();
- } catch (IOException ioe) {
+ } catch (RuntimeException ioe) {
throw new CacheLoaderException("Unable to create context", ioe);
}
}
@@ -372,7 +372,7 @@
return null;
try {
Bucket bucket;
- final InputStream content = blob.getContent();
+ final InputStream content = blob.getPayload().getInput();
if (cfg.isCompress()) {
bucket = uncompress(blob, bucketName, content);
} else
@@ -404,13 +404,15 @@
Streams.copy(is, bos2);
final byte[] uncompressedByteArray = bos2.toByteArray();
- byte[] md5FromStoredBlob = blob.getMetadata().getContentMD5();
+ byte[] md5FromStoredBlob = blob.getMetadata().getContentMetadata().getContentMD5();
+
+ // not all blobstores support md5 on GET request
+ if (md5FromStoredBlob != null){
+ byte[] hash = getMd5Digest(compressedByteArray);
+ if (!Arrays.equals(hash, md5FromStoredBlob))
+ throw new CacheLoaderException("MD5 hash failed when reading (transfer error) for entry " + bucketName);
+ }
- byte[] hash = getMd5Digest(compressedByteArray);
-
- if (!Arrays.equals(hash, md5FromStoredBlob))
- throw new CacheLoaderException("MD5 hash failed when reading (transfer error) for entry " + bucketName);
-
is.close();
bis.close();
bos.close();
@@ -435,7 +437,7 @@
final byte[] compressedByteArray = baos.toByteArray();
- blob.getMetadata().setContentMD5(getMd5Digest(compressedByteArray));
+ blob.getMetadata().getContentMetadata().setContentMD5(getMd5Digest(compressedByteArray));
baos.close();
Modified: branches/4.2.x/parent/pom.xml
===================================================================
--- branches/4.2.x/parent/pom.xml 2010-09-27 15:39:20 UTC (rev 2442)
+++ branches/4.2.x/parent/pom.xml 2010-09-27 16:39:21 UTC (rev 2443)
@@ -99,7 +99,7 @@
<version.jbossjts>4.9.0.GA</version.jbossjts>
<version.jbossts-common>4.6.1.GA</version.jbossts-common>
<version.jcipannotations>1.0</version.jcipannotations>
- <version.jclouds>1.0-beta-6</version.jclouds>
+ <version.jclouds>1.0-beta-7</version.jclouds>
<version.jetty>6.1.15</version.jetty>
<version.jgoodies.forms>1.0.5</version.jgoodies.forms>
<version.jgroups>2.10.0.GA</version.jgroups>
More information about the infinispan-commits
mailing list