| commit | c3e72e99dd329810f50442cae2fef3a489e3581c | [log] [tgz] |
|---|---|---|
| author | Nes Cohen <nes@muse.dev> | Tue Aug 18 15:10:54 2020 -0700 |
| committer | Charles S. Givre <cgivre@apache.org> | Thu Aug 20 14:45:03 2020 -0400 |
| tree | 40fdfd3fa90fae0fe85813464ba6d10af4d29b7b | |
| parent | 0726b83d9347cbb8bd1bc64a8d10c12c1125549a [diff] |
DRILL-7780: Fix string reference comparisons
diff --git a/common/src/main/java/org/apache/drill/common/KerberosUtil.java b/common/src/main/java/org/apache/drill/common/KerberosUtil.java index 368e493..0dfce33 100644 --- a/common/src/main/java/org/apache/drill/common/KerberosUtil.java +++ b/common/src/main/java/org/apache/drill/common/KerberosUtil.java
@@ -47,7 +47,7 @@ checkNotNull(realm); return primary + - ((instance != "") ? "/" + instance : "") + ((!"".equals(instance)) ? "/" + instance : "") + "@" + realm; }
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java index 74a5d96..b090857 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java
@@ -139,7 +139,7 @@ ExecConstants.SERVICE_PRINCIPAL)); } - parts[1] = (parts[1] == "") ? "" : KerberosUtil.canonicalizeInstanceName(parts[1], hostName); + parts[1] = ("".equals(parts[1])) ? "" : KerberosUtil.canonicalizeInstanceName(parts[1], hostName); final String canonicalizedPrincipal = KerberosUtil.getPrincipalFromParts(parts[0], parts[1], parts[2]); final String keytab = config.getString(ExecConstants.SERVICE_KEYTAB_LOCATION);