Merge pull request #94 from EMCECS/bugfix-SDK-615

[SDK-615] LargeFileUploader throws CancellationException when paused

Author: twincitiesguy

src/main/java/com/emc/object/s3/LargeFileUploader.java

@@ -435,8 +435,11 @@ public void doMultipartUpload() {
                 try {
                     resumeContext.getUploadedParts().put(future.get().getPartNumber(), future.get());
                 } catch (ExecutionException e) { // unfortunately, we can't just catch CancellationException here
+                    // get the root cause
+                    Throwable t = e;
+                    while (t.getCause() != null && t.getCause() != t) t = t.getCause();
                     // CancellationException is only thrown when we are terminated early - cancelled tasks will just be ignored
-                    if (e.getCause() == null || !(e.getCause() instanceof CancellationException)) throw e;
+                    if (!(t instanceof CancellationException)) throw e;
                 }
             }