Browse Source

Merge pull request #120 from simonharrer/compare-strings-with-equals-method

Use equals to compare strings instead of ==
tags/v1.4.0
James Moger 10 years ago
parent
commit
40b49016ec

+ 2
- 2
src/main/java/com/gitblit/GitBlitServer.java View File

@@ -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));

+ 1
- 1
src/main/java/com/gitblit/authority/GitblitAuthority.java View File

@@ -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;

Loading…
Cancel
Save