Switched to just abort

Author: rickle-msft

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobDecryptStream.java

@@ -60,8 +60,8 @@ public void close() throws IOException
     }
 
     @Override
-    void abortAndClose() throws IOException {
-        this.cryptoStream.close();
+    void abort() throws IOException {
+        // no-op. This method is used in the case of aborting uploads, and decrypt streams are on downloads.
     }
 
     @Override

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobEncryptStream.java

@@ -45,6 +45,8 @@ final class BlobEncryptStream extends BlobOutputStream {
      * Holds the cipher stream.
      */
     private CipherOutputStream cipherStream;
+
+    private BlobOutputStreamInternal blobStream;
 
     /**
      * Initializes a new instance of the BlobEncryptStream class for a CloudBlockBlob
@@ -70,8 +72,7 @@ protected BlobEncryptStream(final CloudBlockBlob blockBlob, final AccessConditio
         this.options = options;
 
         this.options.setValidateEncryptionPolicy(false);
-        BlobOutputStreamInternal blobStream = 
-                new BlobOutputStreamInternal(blockBlob, accessCondition, options, opContext);
+        blobStream = new BlobOutputStreamInternal(blockBlob, accessCondition, options, opContext);
         this.cipherStream = new CipherOutputStream(blobStream, cipher);
     }
 
@@ -160,8 +161,8 @@ public void close() throws IOException {
     }
 
     @Override
-    void abortAndClose() throws IOException {
-        this.cipherStream.close();
+    void abort() throws IOException {
+        this.blobStream.abort();
     }
 
 }

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobOutputStream.java

@@ -113,8 +113,8 @@ public void write(final byte[] data) throws IOException {
     public abstract void close() throws IOException;
 
     /**
-     * Closes the output stream without committing the data to the service, typically to be used in cases of errors or
-     * exceptions in the data source.
+     * Signals to the BlobOutputStream that it is being aborted and should not commit the data to the service on
+     * closing, typically to be used in cases of errors or exceptions in the data source.
      */
-    abstract void abortAndClose() throws IOException;
+    abstract void abort() throws IOException;
 }

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobOutputStreamInternal.java

@@ -144,6 +144,11 @@ public Thread newThread(Runnable r) {
      */
     private final ThreadPoolExecutor threadExecutor;
 
+    /**
+     * Indicates whether the stream has been aborted and therefore closing will skip committing data.
+     */
+    private boolean aborted;
+
     /**
      * Initializes a new instance of the BlobOutputStream class.
      * 
@@ -314,17 +319,20 @@ public synchronized void close() throws IOException {
             this.checkStreamState();
 
             // flush any remaining data
-            this.flush();
+            if (!this.aborted) {
+                this.flush();
+            }
 
             // shut down the ExecutorService.
             this.threadExecutor.shutdown();
 
             // try to commit the blob
-            try {
-                this.commit();
-            }
-            catch (final StorageException e) {
-                throw Utility.initIOException(e);
+            if (!this.aborted) {
+                try {
+                    this.commit();
+                } catch (final StorageException e) {
+                    throw Utility.initIOException(e);
+                }
             }
         }
         finally {
@@ -340,18 +348,8 @@ public synchronized void close() throws IOException {
     }
 
     @Override
-    public void abortAndClose() throws IOException {
-        try {
-            this.checkStreamState();
-
-            this.threadExecutor.shutdown();
-        } finally {
-            this.lastError = new IOException(SR.STREAM_CLOSED);
-
-            if (!this.threadExecutor.isShutdown()) {
-                this.threadExecutor.shutdown();
-            }
-        }
+    public void abort() throws IOException {
+        this.aborted = true;
     }
 
     /**

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudBlockBlob.java

@@ -893,20 +893,21 @@ public byte[] getByteArray() {
             useOpenWrite = true;
             if (useOpenWrite) {
                 final BlobOutputStream writeStream = this.openOutputStream(accessCondition, options, opContext);
-                if (options.getCommitWriteOnInputStreamException()) {
-                    try {
-                        writeStream.write(inputDataStream, length);
-                    } finally {
-                        writeStream.close();
-                    }
-                } else {
-                    try {
-                        writeStream.write(inputDataStream, length);
-                        writeStream.close();
-                    } catch (Exception e) {
-                        writeStream.abortAndClose();
-                        throw e;
+                /*
+                We want to give the customer the option to skip the commit on close in case of input stream failures.
+                While we catch all exceptions here, both from reading the IS and writing to the service, any write which
+                fails in such a way as to throw effectively aborts the upload anyway, so calling abort in all cases
+                achieves the intended behavior.
+                 */
+                try {
+                    writeStream.write(inputDataStream, length);
+                } catch (Exception e) {
+                    if (!options.getCommitWriteOnInputStreamException()) {
+                        writeStream.abort();
                     }
+                    throw e;
+                } finally {
+                    writeStream.close();
                 }
             }
             else {

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/LengthLimitingStream.java

@@ -82,8 +82,8 @@ public void close() throws IOException {
     }
 
     @Override
-    void abortAndClose() throws IOException {
-        // no op
+    void abort() throws IOException {
+        // no op. Abort is only used to abort uploads and this type is only used on download paths.
     }
 
 }