Merge branch 'master' into fix_eject_storage_domain

RachelTucker · RachelTucker · commit 13ecb47ac0c9 · 2016-10-14T13:42:09.000-06:00
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/WriteJobImpl.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/WriteJobImpl.java
@@ -170,7 +170,6 @@ public void emitWaitingForChunksEvents(final int secondsToDelay) {
                 throw new RuntimeException(e);
             }
         } catch (final Throwable t) {
-            running = false;
             emitFailureEvent(makeFailureEvent(FailureEvent.FailureActivity.PuttingObject, t, masterObjectList.getObjects().get(0)));
             throw t;
         }

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,6 @@ public void emitWaitingForChunksEvents(final int secondsToDelay) {`
`170`	`170`	`throw new RuntimeException(e);`
`171`	`171`	`}`
`172`	`172`	`} catch (final Throwable t) {`
`173`		`- running = false;`
`174`	`173`	`emitFailureEvent(makeFailureEvent(FailureEvent.FailureActivity.PuttingObject, t, masterObjectList.getObjects().get(0)));`
`175`	`174`	`throw t;`
`176`	`175`	`}`