Skip to content

Commit 896f0a1

Browse files
author
Nakul Sabharwal
committed
Added try catch which closing stream in Chunked upload
1 parent bcb8699 commit 896f0a1

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -150,38 +150,38 @@ public ChunkedUploadResult<UploadType> generateResult(
150150
final ILogger logger) throws Exception {
151151
InputStream in = null;
152152
try {
153-
try {
154-
if (response.code() == HttpResponseCode.HTTP_ACCEPTED) {
155-
logger.logDebug("Chunk bytes has been accepted by the server.");
156-
in = new BufferedInputStream(response.body().byteStream());
157-
final UploadSession session = serializer.deserializeObject(
158-
DefaultHttpProvider.streamToString(in), UploadSession.class);
159-
160-
return new ChunkedUploadResult<UploadType>(session);
161-
162-
} else if (response.code() == HttpResponseCode.HTTP_CREATED
163-
|| response.code() == HttpResponseCode.HTTP_OK) {
164-
logger.logDebug("Upload session is completed, uploaded item returned.");
165-
in = new BufferedInputStream(response.body().byteStream());
166-
String rawJson = DefaultHttpProvider.streamToString(in);
167-
UploadType uploadedItem = serializer.deserializeObject(rawJson,
168-
this.deserializeTypeClass);
169-
170-
return new ChunkedUploadResult<UploadType>(uploadedItem);
171-
} else if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
172-
logger.logDebug("Receiving error during upload, see detail on result error");
173-
174-
return new ChunkedUploadResult<UploadType>(
175-
GraphServiceException.createFromConnection(request, null, serializer,
176-
response, logger));
177-
}
178-
} finally {
179-
if (in != null) {
153+
if (response.code() == HttpResponseCode.HTTP_ACCEPTED) {
154+
logger.logDebug("Chunk bytes has been accepted by the server.");
155+
in = new BufferedInputStream(response.body().byteStream());
156+
final UploadSession session = serializer.deserializeObject(
157+
DefaultHttpProvider.streamToString(in), UploadSession.class);
158+
159+
return new ChunkedUploadResult<UploadType>(session);
160+
161+
} else if (response.code() == HttpResponseCode.HTTP_CREATED
162+
|| response.code() == HttpResponseCode.HTTP_OK) {
163+
logger.logDebug("Upload session is completed, uploaded item returned.");
164+
in = new BufferedInputStream(response.body().byteStream());
165+
String rawJson = DefaultHttpProvider.streamToString(in);
166+
UploadType uploadedItem = serializer.deserializeObject(rawJson,
167+
this.deserializeTypeClass);
168+
169+
return new ChunkedUploadResult<UploadType>(uploadedItem);
170+
} else if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
171+
logger.logDebug("Receiving error during upload, see detail on result error");
172+
173+
return new ChunkedUploadResult<UploadType>(
174+
GraphServiceException.createFromConnection(request, null, serializer,
175+
response, logger));
176+
}
177+
} finally {
178+
if (in != null) {
179+
try{
180180
in.close();
181+
} catch(IOException e) {
182+
logger.logError(e.getMessage(), e);
181183
}
182184
}
183-
} catch(IOException e) {
184-
e.printStackTrace();
185185
}
186186
return null;
187187
}

src/main/java/com/microsoft/graph/http/BaseRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public IShouldRetry getShouldRetry() {
442442
* @param maxRetries Max retries for a request
443443
*/
444444
public void setMaxRetries(int maxRetries) {
445-
this.maxRedirects = maxRedirects;
445+
this.maxRetries = maxRetries;
446446
}
447447

448448
/**

0 commit comments

Comments
 (0)