diff options
| author | James Moger <james.moger@gitblit.com> | 2013-10-24 05:13:21 -0700 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-10-24 05:13:21 -0700 |
| commit | 40b49016ec87a4b4af9df173bdfc36c5a9da20cc (patch) | |
| tree | e4d4edd0dfb088fa7f1985c985854f2e896f8cd2 /src | |
| parent | 020a4d6dccfa25235a1481efc3e449a73a0d659a (diff) | |
| parent | e3952516c835351e4e357c5ef3ee913ec78353d3 (diff) | |
| download | gitblit-40b49016ec87a4b4af9df173bdfc36c5a9da20cc.tar.gz gitblit-40b49016ec87a4b4af9df173bdfc36c5a9da20cc.zip | |
Merge pull request #120 from simonharrer/compare-strings-with-equals-method
Use equals to compare strings instead of ==
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/gitblit/GitBlitServer.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/authority/GitblitAuthority.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java index ace1f2f0..ca2f7ebb 100644 --- a/src/main/java/com/gitblit/GitBlitServer.java +++ b/src/main/java/com/gitblit/GitBlitServer.java @@ -95,7 +95,7 @@ public class GitBlitServer { if (i + 1 == args.length) {
System.out.println("Invalid --baseFolder parameter!");
System.exit(-1);
- } else if (args[i + 1] != ".") {
+ } else if (!".".equals(args[i + 1])) {
folder = args[i + 1];
}
i = i + 1;
@@ -346,7 +346,7 @@ public class GitBlitServer { // Start up an in-memory LDAP server, if configured
try {
- if (StringUtils.isEmpty(params.ldapLdifFile) == false) {
+ if (!StringUtils.isEmpty(params.ldapLdifFile)) {
File ldifFile = new File(params.ldapLdifFile);
if (ldifFile != null && ldifFile.exists()) {
URI ldapUrl = new URI(settings.getRequiredString(Keys.realm.ldap.server));
diff --git a/src/main/java/com/gitblit/authority/GitblitAuthority.java b/src/main/java/com/gitblit/authority/GitblitAuthority.java index 37088ae8..668ca982 100644 --- a/src/main/java/com/gitblit/authority/GitblitAuthority.java +++ b/src/main/java/com/gitblit/authority/GitblitAuthority.java @@ -146,7 +146,7 @@ public class GitblitAuthority extends JFrame implements X509Log { if (i + 1 == args.length) {
System.out.println("Invalid --baseFolder parameter!");
System.exit(-1);
- } else if (args[i + 1] != ".") {
+ } else if (!".".equals(args[i + 1])) {
folder = args[i+1];
}
break;
|