Merge pull request #196 from mziccard/fix-copy-source-generation

aozarov · aozarov · commit 0de314146f83 · 2015-10-01T11:29:05.000-07:00
Fix source (meta)generation parameters in StorageImpl.copy
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -331,10 +331,11 @@ public StorageObject copy(StorageObject source, Map<Option, ?> sourceOptions,
           .copy(source.getBucket(), source.getName(), target.getBucket(), target.getName(),
               target.getContentType() != null ? target : null)
           .setProjection(DEFAULT_PROJECTION)
-          .setIfMetagenerationMatch(IF_SOURCE_METAGENERATION_MATCH.getLong(sourceOptions))
-          .setIfMetagenerationNotMatch(IF_SOURCE_METAGENERATION_NOT_MATCH.getLong(sourceOptions))
-          .setIfGenerationMatch(IF_SOURCE_GENERATION_MATCH.getLong(sourceOptions))
-          .setIfGenerationNotMatch(IF_SOURCE_GENERATION_NOT_MATCH.getLong(sourceOptions))
+          .setIfSourceMetagenerationMatch(IF_SOURCE_METAGENERATION_MATCH.getLong(sourceOptions))
+          .setIfSourceMetagenerationNotMatch(
+              IF_SOURCE_METAGENERATION_NOT_MATCH.getLong(sourceOptions))
+          .setIfSourceGenerationMatch(IF_SOURCE_GENERATION_MATCH.getLong(sourceOptions))
+          .setIfSourceGenerationNotMatch(IF_SOURCE_GENERATION_NOT_MATCH.getLong(sourceOptions))
           .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(targetOptions))
           .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(targetOptions))
           .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(targetOptions))
