Remove deub prints and fall back to traditional upload if file is not…

… large enough.
hhutch · Apr 19, 2012 · 52c144f · 52c144f
1 parent 19e5669
commit 52c144f
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/...clouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java b/...clouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java
@@ -42,7 +42,6 @@ public SequentialMultipartUploadStrategy(SwiftBlobStore ablobstore, PayloadSlice
 
     @Override
     public String execute(String container, Blob blob, PutOptions options, BlobToObject blob2Object) {
-        System.out.println("here we go");
         String key = blob.getMetadata().getName();
         Payload payload = blob.getPayload();
         MultipartUploadSlicingAlgorithm algorithm = new MultipartUploadSlicingAlgorithm();
@@ -57,10 +56,8 @@ public String execute(String container, Blob blob, PutOptions options, BlobToObj
                     .getProviderSpecificContext().getApi();
 
             try {
-                SortedMap<Integer, String> etags = Maps.newTreeMap();
                 int part;
                 while ((part = algorithm.getNextPart()) <= parts) {
-                    System.out.println("Uploading part " + part);
                     Payload chunkedPart = slicer.slice(payload,
                             algorithm.getNextChunkOffset(), chunkSize);
                     Blob blobPart = ablobstore.blobBuilder(blob.getMetadata().getName() + PART_SEPARATOR +
@@ -70,7 +67,6 @@ public String execute(String container, Blob blob, PutOptions options, BlobToObj
                 }
                 long remaining = algorithm.getRemaining();
                 if (remaining > 0) {
-                    System.out.println("Uploading tail.");
                     Payload chunkedPart = slicer.slice(payload,
                             algorithm.getNextChunkOffset(), remaining);
                     Blob blobPart = ablobstore.blobBuilder(blob.getMetadata().getName() + PART_SEPARATOR + 
@@ -84,11 +80,10 @@ public String execute(String container, Blob blob, PutOptions options, BlobToObj
                 if (rtex == null) {
                     rtex = new RuntimeException(ex);
                 }
-                //client.abortMultipartUpload(container, key, uploadId);
                 throw rtex;
             }
-
+        } else {
+            return ablobstore.putBlob(container, blob, PutOptions.NONE);
         }
-        return "NOT IMPLEMENTED";
     }
 }