Removing a misguided attempt to take a job out of running state.

Author: GraciesPadre

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

@@ -344,14 +344,6 @@ public void onFailure(final FailureEvent failureEvent) {
                 readJob.transfer(new FileObjectGetter(tempDirectory));
             } catch (final IOException e) {
                 assertEquals(1, numFailuresRecorded.getValue());
-
-                readJob.removeFailureEventListener(failureEventListener);
-
-                try {
-                    readJob.transfer(new FileObjectGetter(tempDirectory));
-                } catch (final IOException ioe) {
-                    assertEquals(1, numFailuresRecorded.getValue());
-                }
             }
         } finally {
             FileUtils.deleteDirectory(tempDirectory.toFile());
@@ -410,14 +402,6 @@ public void onFailure(final FailureEvent failureEvent) {
                 readJob.transfer(new FileObjectGetter(tempDirectory));
             } catch (final IOException e) {
                 assertEquals(1, numFailuresRecorded.getValue());
-
-                readJob.removeFailureEventListener(failureEventListener);
-
-                try {
-                    readJob.transfer(new FileObjectGetter(tempDirectory));
-                } catch (final IOException ioe) {
-                    assertEquals(1, numFailuresRecorded.getValue());
-                }
             }
         } finally {
             FileUtils.deleteDirectory(tempDirectory.toFile());

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

@@ -957,14 +957,6 @@ public void onFailure(final FailureEvent failureEvent) {
                 writeJob.transfer(new FileObjectPutter(tempDirectory));
             } catch (final Ds3NoMoreRetriesException e) {
                 assertEquals(1, numFailureEventsFired.getValue());
-
-                writeJob.removeFailureEventListener(failureEventListener);
-
-                try {
-                    writeJob.transfer(new FileObjectPutter(tempDirectory));
-                } catch (final Ds3NoMoreRetriesException nmre) {
-                    assertEquals(1, numFailureEventsFired.getValue());
-                }
             }
         } finally {
             FileUtils.deleteDirectory(tempDirectory.toFile());
@@ -1028,14 +1020,6 @@ public void onFailure(final FailureEvent failureEvent) {
                 writeJob.transfer(new FileObjectPutter(tempDirectory));
             } catch (final RuntimeException e) {
                 assertEquals(1, numFailureEventsFired.getValue());
-
-                writeJob.removeFailureEventListener(failureEventListener);
-
-                try {
-                    writeJob.transfer(new FileObjectPutter(tempDirectory));
-                } catch (final RuntimeException nmre) {
-                    assertEquals(1, numFailureEventsFired.getValue());
-                }
             }
         } finally {
             FileUtils.deleteDirectory(tempDirectory.toFile());

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/ReadJobImpl.java

@@ -161,7 +161,6 @@ public void emitWaitingForChunksEvents(final int secondsToDelay) {
                 throw new RuntimeException(e);
             }
         } catch (final Throwable t) {
-            running = false;
             emitFailureEvent(makeFailureEvent(FailureEvent.FailureActivity.GettingObject, t, masterObjectList.getObjects().get(0)));
             throw t;
         }

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/WriteJobImpl.java

@@ -50,7 +50,6 @@ class WriteJobImpl extends JobImpl {
     private final int retryAfter; // Negative retryAfter value represent infinity retries
     private final int retryDelay; //Negative value means use default
 
-    private int retryAfterLeft; // The number of retries left
     private Ds3ClientHelpers.MetadataAccess metadataAccess = null;
     private ChecksumFunction checksumFunction = null;
 
@@ -74,7 +73,7 @@ public WriteJobImpl(
             this.partTracker = JobPartTrackerFactory
                     .buildPartTracker(ReadJobImpl.getAllBlobApiBeans(filteredChunks), eventRunner);
         }
-        this.retryAfter = this.retryAfterLeft = retryAfter;
+        this.retryAfter = retryAfter;
         this.retryDelay = retryDelay;
 
         this.checksumType = type;