Merge pull request #88 from jofriedm-msft/dev

IOExceptions wrapping StorageExceptions will now contain the StorageE…

Author: jofriedm-msft

ChangeLog.txt

@@ -1,5 +1,6 @@
 2017.XX.XX Version 6.0.0
  * Added support for taking a snapshot of a share.
+ * IOExceptions wrapping StorageExceptions will now contain the StorageException message in the outer exception.
 
 2017.08.28 Version 5.5.0
  * Fixed a bug when using a SAS token where the token was being omitted from calls to delete a directory in the file service.

microsoft-azure-storage-test/src/com/microsoft/azure/storage/EventFiringTests.java

@@ -20,14 +20,10 @@
 import com.microsoft.azure.storage.TestRunners.DevFabricTests;
 import com.microsoft.azure.storage.TestRunners.DevStoreTests;
 
-import org.apache.http.protocol.HTTP;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.net.SocketException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 
@@ -121,39 +117,46 @@ public void eventOccurred(ErrorReceivingResponseEvent eventArg) {
             }
         });
 
-        OperationContext.getGlobalErrorReceivingResponseEventHandler().addListener(new StorageEvent<ErrorReceivingResponseEvent>() {
+        StorageEvent<ErrorReceivingResponseEvent> globalResponseReceivedListener = new StorageEvent<ErrorReceivingResponseEvent>() {
 
             @Override
             public void eventOccurred(ErrorReceivingResponseEvent eventArg) {
                 fail("This event should not trigger");
             }
-        });
+        };
 
-        assertEquals(0, callList.size());
-        assertEquals(0, globalCallList.size());
+        try {
+            OperationContext.getGlobalErrorReceivingResponseEventHandler().addListener(globalResponseReceivedListener);
 
-        CloudBlobClient blobClient = TestHelper.createCloudBlobClient();
-        CloudBlobContainer container = blobClient.getContainerReference("container1");
+            assertEquals(0, callList.size());
+            assertEquals(0, globalCallList.size());
 
-        // make sure both update
-        container.exists(null, null, eventContext);
-        assertEquals(1, callList.size());
-        assertEquals(1, globalCallList.size());
+            CloudBlobClient blobClient = TestHelper.createCloudBlobClient();
+            CloudBlobContainer container = blobClient.getContainerReference("container1");
 
-        // make sure only global updates
-        container.exists();
-        assertEquals(1, callList.size());
-        assertEquals(2, globalCallList.size());
+            // make sure both update
+            container.exists(null, null, eventContext);
+            assertEquals(1, callList.size());
+            assertEquals(1, globalCallList.size());
 
-        OperationContext
-                .setGlobalResponseReceivedEventHandler(new StorageEventMultiCaster<ResponseReceivedEvent, StorageEvent<ResponseReceivedEvent>>());
-        eventContext
-                .setResponseReceivedEventHandler(new StorageEventMultiCaster<ResponseReceivedEvent, StorageEvent<ResponseReceivedEvent>>());
+            // make sure only global updates
+            container.exists();
+            assertEquals(1, callList.size());
+            assertEquals(2, globalCallList.size());
 
-        // make sure neither update
-        container.exists(null, null, eventContext);
-        assertEquals(1, callList.size());
-        assertEquals(2, globalCallList.size());
+            OperationContext
+                    .setGlobalResponseReceivedEventHandler(new StorageEventMultiCaster<ResponseReceivedEvent, StorageEvent<ResponseReceivedEvent>>());
+            eventContext
+                    .setResponseReceivedEventHandler(new StorageEventMultiCaster<ResponseReceivedEvent, StorageEvent<ResponseReceivedEvent>>());
+
+            // make sure neither update
+            container.exists(null, null, eventContext);
+            assertEquals(1, callList.size());
+            assertEquals(2, globalCallList.size());
+        }
+        finally {
+            OperationContext.getGlobalErrorReceivingResponseEventHandler().removeListener(globalResponseReceivedListener);
+        }
     }
 
     @Test

microsoft-azure-storage/src/com/microsoft/azure/storage/core/Utility.java

@@ -767,8 +767,15 @@ public static XMLStreamWriter createXMLStreamWriter(StringWriter outWriter) thro
      * @return A <code>java.io.IOException</code> object that represents the created IO exception.
      */
     public static IOException initIOException(final Exception ex) {
-        final IOException retEx = new IOException();
-        retEx.initCause(ex);
+        String message = null;
+        if (ex != null && ex.getMessage() != null) {
+            message = ex.getMessage() + " Please see the cause for further information.";
+        }
+        else {
+            message = "Please see the cause for further information.";
+        }
+
+        final IOException retEx = new IOException(message, ex);
         return retEx;
     }