Repository: jclouds-labs-aws Updated Branches: refs/heads/1.8.x 097b4bd91 -> 1d50c7143
JCLOUDS-534 Avoid runtime incompatibility introduced by Guava's closeQuietly. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/commit/1d50c714 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/tree/1d50c714 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/diff/1d50c714 Branch: refs/heads/1.8.x Commit: 1d50c71431c3d157206813fed3db6d7b85004c2f Parents: 097b4bd Author: Adrian Cole <[email protected]> Authored: Mon Oct 27 09:07:55 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Wed Oct 29 18:45:47 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/jclouds/glacier/util/AWSRequestSignerV4.java | 4 ++-- glacier/src/main/java/org/jclouds/glacier/util/TreeHash.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/1d50c714/glacier/src/main/java/org/jclouds/glacier/util/AWSRequestSignerV4.java ---------------------------------------------------------------------- diff --git a/glacier/src/main/java/org/jclouds/glacier/util/AWSRequestSignerV4.java b/glacier/src/main/java/org/jclouds/glacier/util/AWSRequestSignerV4.java index 3b9b2ba..80cc84f 100644 --- a/glacier/src/main/java/org/jclouds/glacier/util/AWSRequestSignerV4.java +++ b/glacier/src/main/java/org/jclouds/glacier/util/AWSRequestSignerV4.java @@ -18,6 +18,7 @@ package org.jclouds.glacier.util; import static com.google.common.base.Charsets.UTF_8; import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.util.Closeables2.closeQuietly; import java.io.IOException; import java.util.Locale; @@ -42,7 +43,6 @@ import com.google.common.hash.HashingInputStream; import com.google.common.io.BaseEncoding; import com.google.common.io.ByteSource; import com.google.common.io.ByteStreams; -import com.google.common.io.Closeables; import com.google.common.net.HttpHeaders; // TODO: Query parameters, not necessary for Glacier @@ -144,7 +144,7 @@ public final class AWSRequestSignerV4 { } catch (IOException e) { throw new HttpException("Error signing request", e); } finally { - Closeables.closeQuietly(his); + closeQuietly(his); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/1d50c714/glacier/src/main/java/org/jclouds/glacier/util/TreeHash.java ---------------------------------------------------------------------- diff --git a/glacier/src/main/java/org/jclouds/glacier/util/TreeHash.java b/glacier/src/main/java/org/jclouds/glacier/util/TreeHash.java index aa0280d..7ead9fc 100644 --- a/glacier/src/main/java/org/jclouds/glacier/util/TreeHash.java +++ b/glacier/src/main/java/org/jclouds/glacier/util/TreeHash.java @@ -18,6 +18,7 @@ package org.jclouds.glacier.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.util.Closeables2.closeQuietly; import java.io.IOException; import java.io.InputStream; @@ -35,7 +36,6 @@ import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; import com.google.common.hash.HashingInputStream; import com.google.common.io.ByteStreams; -import com.google.common.io.Closeables; public final class TreeHash { private static final int CHUNK_SIZE = 1024 * 1024; @@ -122,7 +122,7 @@ public final class TreeHash { //The result list contains exactly one element now. return new TreeHash(hashList(list.build()), linearHis.hash()); } finally { - Closeables.closeQuietly(is); + closeQuietly(is); } }
