Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-03 21:29:18 +01:00
Code Issues Packages Projects Releases Activity

Merge pull request #1406 from scm-manager/bugfix/fix_equals

Browse Source 
Fix equals in UserAgent
This commit is contained in:
Sebastian Sdorra
2020-11-04 07:38:40 +01:00
committed by GitHub
parent d50bda7f13 a9406a2310
commit bed8e3a047
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-core/src/main/java/sonia/scm/web/UserAgent.java
View File

@@ -24,18 +24,14 @@
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;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
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 +114,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);
}
/**
@@ -268,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;
}