Merging in other changes

jianghaolu · Jun 22, 2019 · e04fe33 · e04fe33
2 parents 96e94a7 + 6e7aaf1
commit e04fe33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/core/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java b/core/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java
@@ -14,7 +14,6 @@
 import reactor.netty.NettyOutbound;
 import reactor.netty.http.client.HttpClientRequest;
 import reactor.netty.http.client.HttpClientResponse;
-import reactor.netty.resources.ConnectionProvider;
 
 import java.nio.charset.Charset;
 import java.util.Objects;

diff --git a/storage/client/src/main/java/com/azure/storage/blob/BlobAsyncClient.java b/storage/client/src/main/java/com/azure/storage/blob/BlobAsyncClient.java
@@ -395,8 +395,8 @@ public Mono<Void> downloadToFile(String filePath, BlobRange range, BlobAccessCon
                 .flatMap(dar -> FluxUtil.bytebufStreamToFile(dar.body(options), channel, chunk.offset() - (range == null ? 0 : range.offset())))
                 .timeout(Duration.ofSeconds(300))
                 .retry(3, throwable -> throwable instanceof IOException || throwable instanceof TimeoutException)
-                .doOnTerminate(() ->
-                    System.out.println("Saved " + chunk.toString() + " on thread " + Thread.currentThread().getName() + " of total " + Thread.activeCount() + " threads")))
+                /*.doOnTerminate(() ->
+                    System.out.println("Saved " + chunk.toString() + " on thread " + Thread.currentThread().getName() + " of total " + Thread.activeCount() + " threads"))*/)
             .then()
             .doOnTerminate(() -> {
                 try {

diff --git a/storage/client/src/main/java/com/azure/storage/blob/BlobAsyncRawClient.java b/storage/client/src/main/java/com/azure/storage/blob/BlobAsyncRawClient.java
@@ -257,7 +257,7 @@ public Mono<DownloadAsyncResponse> download() {
     public Mono<DownloadAsyncResponse> download(BlobRange range, BlobAccessConditions accessConditions,
                                              boolean rangeGetContentMD5, Context context) {
         range = range == null ? new BlobRange(0) : range;
-        System.out.println("Downloading " + range.toString() + " on thread " + Thread.currentThread().getName());
+//        System.out.println("Downloading " + range.toString() + " on thread " + Thread.currentThread().getName());
         Boolean getMD5 = rangeGetContentMD5 ? rangeGetContentMD5 : null;
         accessConditions = accessConditions == null ? new BlobAccessConditions() : accessConditions;
         HTTPGetterInfo info = new HTTPGetterInfo()