Skip to content
Snippets Groups Projects
Commit 68d5d7ac authored by OZGCloud's avatar OZGCloud
Browse files

add closing stream on error when uploading file

parent 5d4f18f2
Branches
Tags
No related merge requests found
...@@ -99,12 +99,14 @@ public class GrpcFileUploadUtils { ...@@ -99,12 +99,14 @@ public class GrpcFileUploadUtils {
LOG.warn("File transfer canceled on timeout"); LOG.warn("File transfer canceled on timeout");
resultFuture.cancel(true); resultFuture.cancel(true);
requestObserver.onError(new TechnicalException("Timeout on waiting for upload.")); requestObserver.onError(new TechnicalException("Timeout on waiting for upload."));
closeStreams();
} }
public void cancelOnError(Throwable t) { public void cancelOnError(Throwable t) {
LOG.error("File tranfer canceled on error.", t); LOG.error("File tranfer canceled on error.", t);
resultFuture.cancel(true); resultFuture.cancel(true);
requestObserver.onError(t); requestObserver.onError(t);
closeStreams();
} }
void sendNext() { void sendNext() {
...@@ -152,7 +154,13 @@ public class GrpcFileUploadUtils { ...@@ -152,7 +154,13 @@ public class GrpcFileUploadUtils {
private void endTransfer() { private void endTransfer() {
requestObserver.onCompleted(); requestObserver.onCompleted();
done.set(true); done.set(true);
LOG.debug("File Transfer done. Closing stream."); LOG.debug("File Transfer done.");
closeStreams();
}
private void closeStreams() {
LOG.debug("Closing streams");
IOUtils.closeQuietly(inputStream); IOUtils.closeQuietly(inputStream);
streamReader.close(); streamReader.close();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment