Redoing changes

Author: scribe

build.gradle

@@ -14,7 +14,7 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.2.61'
+    ext.kotlin_version = '1.2.70'
 
     repositories {
         mavenCentral()
@@ -36,7 +36,7 @@ plugins {
 
 allprojects {
     group = 'com.spectralogic.ds3'
-    version = '5.0.4.5-debug'
+    version = '5.0.4'
 }
 
 subprojects {

ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/PutJobManagement_Test.java

@@ -2054,15 +2054,18 @@ public void testCancelingJob() throws URISyntaxException, InterruptedException {
             final AtomicBoolean cancelHandlerCalled = new AtomicBoolean(false);
             final CountDownLatch countDownLatch = new CountDownLatch(1);
 
-            writeJob.attachObjectCompletedListener(name -> {
-                try {
-                    writeJob.cancel();
-                } catch (final FailedRequestException failedRequestException) {
-                    caughtExceptionWhileCanceling.set(false);
-                } catch (final Throwable t) {
-                    caughtExceptionWhileCanceling.set(true);
-                } finally {
-                    countDownLatch.countDown();
+            final AtomicBoolean hasBeenCancelled = new AtomicBoolean(false);
+            writeJob.attachDataTransferredListener(dataTransferred -> {
+                if(hasBeenCancelled.compareAndSet(false, true)) {
+                    new Thread(() -> {
+                        try {
+                            writeJob.cancel();
+                        } catch (IOException e) {
+                            fail();
+                        } finally {
+                            countDownLatch.countDown();
+                        }
+                    }).start();
                 }
             });
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/strategy/transferstrategy/AbstractTransferStrategy.java

@@ -135,17 +135,18 @@ private void transferAllJobBlobs() throws IOException {
 
                 final int numJobParts = Iterables.size(jobParts);
 
-                if (numJobParts == 0) {
+                if (numJobParts <= 0) {
                     break;
                 }
 
-                final CountDownLatch countDownLatch = new CountDownLatch(numJobParts);
-                transferJobParts(jobParts, countDownLatch, numBlobsRemaining, cancellationCheck);
-                countDownLatch.await();
+                final CountDownLatch jobPartsCompleteLatch = new CountDownLatch(numJobParts);
+                transferJobParts(jobParts, jobPartsCompleteLatch, numBlobsRemaining, cancellationCheck);
+                jobPartsCompleteLatch.await();
             } catch (final Ds3NoMoreRetriesException | FailedRequestException e) {
                 emitFailureEvent(makeFailureEvent(failureActivity, e, firstChunk()));
                 throw e;
             } catch (final InterruptedException | NoSuchElementException e) {
+                LOG.warn("Thread was interrupted");
                 Thread.currentThread().interrupt();
             } catch (final Throwable t) {
                 emitFailureAndSetCachedException(t);
@@ -181,13 +182,13 @@ private synchronized void maybeSetCachedException(final Throwable t) {
     }
 
     private void transferJobParts(final Iterable<JobPart> jobParts,
-                                  final CountDownLatch countDownLatch,
+                                  final CountDownLatch jobPartsCompleteLatch,
                                   final AtomicInteger numBlobsTransferred,
                                   final BooleanSupplier cancellationCheck) {
         for (final JobPart jobPart : jobParts) {
             if (executorService.isShutdown()) {
                 LOG.debug("Executor service is shut down, decrementing countdown latch");
-                countDownLatch.countDown();
+                jobPartsCompleteLatch.countDown();
             } else {
                 executorService.execute(() -> {
                     try {
@@ -203,7 +204,7 @@ private void transferJobParts(final Iterable<JobPart> jobParts,
                     } finally {
                         jobState.blobTransferredOrFailed(jobPart.getBlob());
                         numBlobsTransferred.decrementAndGet();
-                        countDownLatch.countDown();
+                        jobPartsCompleteLatch.countDown();
                     }
                 });
             }
@@ -245,7 +246,9 @@ public void close() {
         canceled = true;
         executorService.shutdown();
         try {
-            executorService.awaitTermination(10000, TimeUnit.MILLISECONDS);
+            if(!executorService.awaitTermination(10, TimeUnit.SECONDS)) {
+                executorService.shutdownNow();
+            };
         } catch (final InterruptedException e) {
             executorService.shutdownNow();
         }