diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java index 0d1f957bfb6..b0da1f337ab 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java @@ -3601,7 +3601,7 @@ public class UnicodeSet extends UnicodeFilter implements Iterable, Compa } } - if (valueAlias.length() > 0) { + if (valueAlias != null && !valueAlias.isEmpty()) { p = UCharacter.getPropertyEnum(propertyAlias); // Treat gc as gcm @@ -3835,7 +3835,7 @@ public class UnicodeSet extends UnicodeFilter implements Iterable, Compa else { // Handle case where no '=' is seen, and \N{} propName = pattern.substring(pos, close); - valueName = ""; + valueName = null; // Handle \N{name} if (isName) {