Repository: jclouds-examples Updated Branches: refs/heads/master bb4a692a0 -> 02cb2161a
Prefer File.delete over File.deleteOnExit The former has deterministic behavior and avoids resource leaks. Project: http://git-wip-us.apache.org/repos/asf/jclouds-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-examples/commit/02cb2161 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-examples/tree/02cb2161 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-examples/diff/02cb2161 Branch: refs/heads/master Commit: 02cb2161a9292b81bed43d823ddd9b03ada8a7bc Parents: bb4a692 Author: Andrew Gaul <[email protected]> Authored: Fri May 23 16:36:15 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri May 23 16:36:15 2014 -0700 ---------------------------------------------------------------------- .../rackspace/cloudfiles/CloudFilesPublish.java | 19 +++++++++++-------- .../rackspace/cloudfiles/UploadObjects.java | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/02cb2161/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java index f957d9c..41e88f5 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java @@ -96,18 +96,21 @@ public class CloudFilesPublish implements Closeable { System.out.format("Create Object From File%n"); File tempFile = File.createTempFile(FILENAME, SUFFIX); - tempFile.deleteOnExit(); - Files.write("Hello Cloud Files", tempFile, Charsets.UTF_8); - - ObjectApi objectApi = cloudFiles.objectApiInRegionForContainer(REGION, CONTAINER_PUBLISH); + try { + Files.write("Hello Cloud Files", tempFile, Charsets.UTF_8); - ByteSource byteSource = Files.asByteSource(tempFile); - Payload payload = Payloads.newByteSourcePayload(byteSource); + ObjectApi objectApi = cloudFiles.objectApiInRegionForContainer(REGION, CONTAINER_PUBLISH); - objectApi.replace(FILENAME + SUFFIX, payload, ImmutableMap.<String, String>of()); + ByteSource byteSource = Files.asByteSource(tempFile); + Payload payload = Payloads.newByteSourcePayload(byteSource); - System.out.format(" %s%s%n", FILENAME, SUFFIX); + objectApi.replace(FILENAME + SUFFIX, payload, ImmutableMap.<String, String>of()); + + System.out.format(" %s%s%n", FILENAME, SUFFIX); + } finally { + tempFile.delete(); + } } /** http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/02cb2161/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java index 4f6ab95..46704a5 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java @@ -91,17 +91,20 @@ public class UploadObjects implements Closeable { String suffix = ".txt"; File tempFile = File.createTempFile(filename, suffix); - tempFile.deleteOnExit(); - Files.write("uploadObjectFromFile", tempFile, Charsets.UTF_8); + try { + Files.write("uploadObjectFromFile", tempFile, Charsets.UTF_8); - ByteSource byteSource = Files.asByteSource(tempFile); - Payload payload = Payloads.newByteSourcePayload(byteSource); - - cloudFiles.objectApiInRegionForContainer(REGION, CONTAINER) - .replace(filename + suffix, payload, ImmutableMap.<String, String> of()); + ByteSource byteSource = Files.asByteSource(tempFile); + Payload payload = Payloads.newByteSourcePayload(byteSource); - System.out.format(" %s%s%n", filename, suffix); + cloudFiles.objectApiInRegionForContainer(REGION, CONTAINER) + .replace(filename + suffix, payload, ImmutableMap.<String, String> of()); + + System.out.format(" %s%s%n", filename, suffix); + } finally { + tempFile.delete(); + } } /**
