Skip to content

close input and output stream of request #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

close input and output stream of request #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions microsoft-azure-storage/src/com/microsoft/azure/storage/core/ExecutionEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand All @@ -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>
Expand Down Expand Up @@ -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) {
Expand All @@ -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);
Expand Down Expand Up @@ -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).
Expand Down Expand Up @@ -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;
}
Expand All @@ -213,6 +222,13 @@ public static <CLIENT_TYPE, PARENT_TYPE, RESULT_TYPE> RESULT_TYPE executeWithRet
if (task.isSent()) {
ExecutionEngine.fireRequestCompletedEvent(opContext, request, task.getResult());
}
if (request != null) {
try {
if (request.getInputStream() != null)
request.getInputStream().close();
} catch (IOException logOrIgnore) {
}
}
}

// Evaluate Retry Policy
Expand Down