From cc780eb737f07293ec58dea07f06a6b274e07854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 3 Nov 2020 12:03:08 +0100 Subject: [PATCH 1/2] Fix equals --- scm-core/src/main/java/sonia/scm/web/UserAgent.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/web/UserAgent.java b/scm-core/src/main/java/sonia/scm/web/UserAgent.java index 0647587a19..46f43a0c14 100644 --- a/scm-core/src/main/java/sonia/scm/web/UserAgent.java +++ b/scm-core/src/main/java/sonia/scm/web/UserAgent.java @@ -24,9 +24,6 @@ package sonia.scm.web; -//~--- non-JDK imports -------------------------------------------------------- - -import com.google.common.base.Charsets; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @@ -34,8 +31,6 @@ import java.nio.charset.Charset; import static com.google.common.base.Preconditions.checkNotNull; -//~--- JDK imports ------------------------------------------------------------ - /** * The software agent that is acting on behalf of a user. The user agent * represents a browser or one of the repository client (svn, git or hg). @@ -118,7 +113,7 @@ public final class UserAgent return Objects.equal(name, other.name) && Objects.equal(browser, other.browser) - && Objects.equal(basicAuthenticationCharset, basicAuthenticationCharset); + && Objects.equal(basicAuthenticationCharset, other.basicAuthenticationCharset); } /** From a9406a2310f0ae757a795c20e189308e8a662d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 3 Nov 2020 12:03:21 +0100 Subject: [PATCH 2/2] Use charset from jdk --- scm-core/src/main/java/sonia/scm/web/UserAgent.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scm-core/src/main/java/sonia/scm/web/UserAgent.java b/scm-core/src/main/java/sonia/scm/web/UserAgent.java index 46f43a0c14..35e4060a91 100644 --- a/scm-core/src/main/java/sonia/scm/web/UserAgent.java +++ b/scm-core/src/main/java/sonia/scm/web/UserAgent.java @@ -28,6 +28,7 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import static com.google.common.base.Preconditions.checkNotNull; @@ -263,7 +264,7 @@ public final class UserAgent private boolean scmClient = false; /** basic authentication charset */ - private Charset basicAuthenticationCharset = Charsets.ISO_8859_1; + private Charset basicAuthenticationCharset = StandardCharsets.ISO_8859_1; }