Checking if version id is null

Author: RachelTucker

ds3-sdk-integration/src/main/java/com/spectralogic/ds3client/integration/Util.java

@@ -73,7 +73,7 @@ public static void forceCleanupBucketsOnBP(final Ds3Client client) throws IOExce
         final GetBucketsSpectraS3Request request = new GetBucketsSpectraS3Request();
         final GetBucketsSpectraS3Response response = client.getBucketsSpectraS3(request);
 
-        for (Bucket bucket : response.getBucketListResult().getBuckets()) {
+        for (final Bucket bucket : response.getBucketListResult().getBuckets()) {
             cancelAllJobsForBucket(client, bucket.getName());
             client.deleteBucketSpectraS3(new DeleteBucketSpectraS3Request(bucket.getName()).withForce(true));
         }

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

@@ -92,7 +92,9 @@ private GetObjectRequest makeGetObjectRequest(final SeekableByteChannel seekable
                 jobId,
                 blob.getOffset());
 
-        getObjectRequest.withVersionId(blob.getVersionId());
+        if (blob.getVersionId() != null) {
+            getObjectRequest.withVersionId(blob.getVersionId());
+        }
         getObjectRequest.withByteRanges(blobRanges);
 
         return getObjectRequest;

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

@@ -86,7 +86,9 @@ private GetObjectRequest makeGetObjectRequest(final SeekableByteChannel seekable
                 jobId,
                 blob.getOffset());
 
-        getObjectRequest.withVersionId(jobPart.getBlob().getVersionId());
+        if (jobPart.getBlob().getVersionId() != null) {
+            getObjectRequest.withVersionId(jobPart.getBlob().getVersionId());
+        }
 
         final ImmutableCollection<Range> rangesForBlob = StrategyUtils.getRangesForBlob(rangesForBlobs, blob);