close output stream of request

Author: dpproduction

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

@@ -1,11 +1,11 @@
 /**
  * Copyright Microsoft Corporation
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.util.Date;
 import java.util.Map.Entry;
@@ -30,7 +31,7 @@
 public final class ExecutionEngine {
     /**
      * Executes an operation and enforces a retrypolicy to handle any potential errors
-     * 
+     *
      * @param <CLIENT_TYPE>
      *            The type of the service client
      * @param <PARENT_TYPE>
@@ -72,6 +73,7 @@ public static <CLIENT_TYPE, PARENT_TYPE, RESULT_TYPE> RESULT_TYPE executeWithRet
         int currentRetryCount = 0;
         StorageException translatedException = null;
         HttpURLConnection request = null;
+        OutputStream requestOutputStream = null;
         final long startTime = new Date().getTime();
 
         while (true) {
@@ -87,8 +89,9 @@ public static <CLIENT_TYPE, PARENT_TYPE, RESULT_TYPE> RESULT_TYPE executeWithRet
                 try {
                     if (task.getSendStream() != null) {
                         Logger.info(opContext, LogConstants.UPLOAD);
+                        requestOutputStream = request.getOutputStream();
                         final StreamMd5AndLength descriptor = Utility.writeToOutputStream(task.getSendStream(),
-                                request.getOutputStream(), task.getLength(), false /* rewindStream */,
+                                requestOutputStream, task.getLength(), false /* rewindStream */,
                                 false /* calculate MD5 */, opContext, task.getRequestOptions());
 
                         task.validateStreamWrite(descriptor);
@@ -131,6 +134,12 @@ public static <CLIENT_TYPE, PARENT_TYPE, RESULT_TYPE> RESULT_TYPE executeWithRet
 
                         ExecutionEngine.fireErrorReceivingResponseEvent(opContext, request, task.getResult());
                     }
+                    if (requestOutputStream != null) {
+                        try {
+                            requestOutputStream.close();
+                        } catch (IOException logOrIgnore) {
+                        }
+                    }
                 }
 
                 // 8. Pre-process response to check if there was an exception. Do Response parsing (headers etc).
@@ -196,7 +205,7 @@ public static <CLIENT_TYPE, PARENT_TYPE, RESULT_TYPE> RESULT_TYPE executeWithRet
                 task.getResult().setStatusCode(e.getHttpStatusCode());
                 task.getResult().setStatusMessage(e.getMessage());
                 task.getResult().setException(e);
-                
+
                 Logger.warn(opContext, LogConstants.RETRYABLE_EXCEPTION, e.getClass().getName(), e.getMessage());
                 translatedException = e;
             }