[infinispan-commits] Infinispan SVN: r1461 - trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-02-05 17:24:12 -0500 (Fri, 05 Feb 2010)
New Revision: 1461

Modified:
   trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java
Log:
Better encoding

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-02-05 22:15:15 UTC (rev 1460)
+++ trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java	2010-02-05 22:24:12 UTC (rev 1461)
@@ -165,7 +165,7 @@
 
    protected Bucket loadBucket(String hash) throws CacheLoaderException {
       try {
-         return readFromBlob(blobStore.getBlob(containerName, getBucketName(hash)), hash);
+         return readFromBlob(blobStore.getBlob(containerName, encodeBucketName(hash)), hash);
       } catch (KeyNotFoundException e) {
          return null;
       }
@@ -204,7 +204,7 @@
    }
 
    protected void insertBucket(Bucket bucket) throws CacheLoaderException {
-      Blob blob = blobStore.newBlob(getBucketName(bucket));
+      Blob blob = blobStore.newBlob(encodeBucketName(bucket.getBucketName()));
       writeToBlob(blob, bucket);
 
       Set<Future<?>> futures = asyncCommandFutures.get();
@@ -257,23 +257,16 @@
       if (blob == null) return null;
       try {
          Bucket bucket = (Bucket) marshaller.objectFromInputStream(blob.getContent());
-         if (bucket != null) bucket.setBucketName(
-               bucketName);
+         if (bucket != null) bucket.setBucketName(bucketName);
          return bucket;
       } catch (Exception e) {
          throw convertToCacheLoaderException("Unable to read blob", e);
       }
    }
 
-   private String getBucketName(Bucket bucket) {
-      return getBucketName(bucket.getBucketName());
+   private String encodeBucketName(String decodedName) {
+      return (decodedName.startsWith("-")) ?  
+            decodedName.replace('-', 'A') :
+            decodedName;
    }
-
-   private String getBucketName(String bucketName) {
-      if (bucketName.startsWith("-"))
-         bucketName = bucketName.replace("-", "A");
-      else if (bucketName.startsWith("A"))
-         bucketName = bucketName.replace("A", "-");
-      return bucketName;
-   }
 }