From b762622a185d59ce0cfc9cbc6ab5dd22469e18a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=B3r=C3=A1nt=20Pint=C3=A9r?= Date: Mon, 3 Apr 2017 21:19:57 +0200 Subject: [PATCH] Do not depend on default charset when hashing +review REVIEW-6495 --- .../changedetection/state/DefaultClasspathContentHasher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/DefaultClasspathContentHasher.java b/subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/DefaultClasspathContentHasher.java index 421f149332be..83c64faf81e5 100644 --- a/subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/DefaultClasspathContentHasher.java +++ b/subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/DefaultClasspathContentHasher.java @@ -16,6 +16,7 @@ package org.gradle.api.internal.changedetection.state; +import com.google.common.base.Charsets; import com.google.common.hash.Funnels; import com.google.common.hash.Hasher; import com.google.common.io.ByteStreams; @@ -31,7 +32,7 @@ public void appendContent(String name, InputStream inputStream, Hasher hasher) { // TODO: Sort entries in META-INF/ignore some entries // TODO: Sort entries in .properties/ignore some entries try { - hasher.putBytes(name.getBytes()); + hasher.putString(name, Charsets.UTF_8); ByteStreams.copy(inputStream, Funnels.asOutputStream(hasher)); } catch (IOException e) { throw new UncheckedIOException(String.format("Failed to hash file '%s' found on classpath", name), e);