--- old/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java 2018-12-06 17:26:15.957459966 -0500 +++ new/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java 2018-12-06 17:26:15.677458577 -0500 @@ -477,9 +477,9 @@ int len = prefix.size(); if (!allEmpty(prefix) && !allEmpty(name)) { - if (res.get(len - 1).equals("")) { + if (res.get(len - 1).isEmpty()) { res.remove(len - 1); - } else if (res.get(len).equals("")) { + } else if (res.get(len).isEmpty()) { res.remove(len); } }