[infinispan-commits] Infinispan SVN: r2424 - in trunk/cachestore/cloud: src/main/java/org/infinispan/loaders/cloud and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: adriancole
Date: 2010-09-21 15:29:34 -0400 (Tue, 21 Sep 2010)
New Revision: 2424

Modified:
   trunk/cachestore/cloud/pom.xml
   trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java
Log:
ISPN-660: updated to jclouds beta 7

Modified: trunk/cachestore/cloud/pom.xml
===================================================================
--- trunk/cachestore/cloud/pom.xml	2010-09-21 17:22:02 UTC (rev 2423)
+++ trunk/cachestore/cloud/pom.xml	2010-09-21 19:29:34 UTC (rev 2424)
@@ -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: trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java
===================================================================
--- trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java	2010-09-21 17:22:02 UTC (rev 2423)
+++ trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java	2010-09-21 19:29:34 UTC (rev 2424)
@@ -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();