< prev index next >
src/java.management/share/classes/javax/management/ImmutableDescriptor.java
Print this page
rev 52881 : 8214971: Replace use of string.equals("") with isEmpty()
Reviewed-by: jlaskey, prappo, lancea, dfuchs, redestad
*** 108,118 ****
throw new IllegalArgumentException("Null Map");
SortedMap<String, Object> map =
new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
for (Map.Entry<String, ?> entry : fields.entrySet()) {
String name = entry.getKey();
! if (name == null || name.equals(""))
throw new IllegalArgumentException("Empty or null field name");
if (map.containsKey(name))
throw new IllegalArgumentException("Duplicate name: " + name);
map.put(name, entry.getValue());
}
--- 108,118 ----
throw new IllegalArgumentException("Null Map");
SortedMap<String, Object> map =
new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
for (Map.Entry<String, ?> entry : fields.entrySet()) {
String name = entry.getKey();
! if (name == null || name.isEmpty())
throw new IllegalArgumentException("Empty or null field name");
if (map.containsKey(name))
throw new IllegalArgumentException("Duplicate name: " + name);
map.put(name, entry.getValue());
}
*** 164,174 ****
throw new IllegalArgumentException("Different size arrays");
SortedMap<String, Object> map =
new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
for (int i = 0; i < fieldNames.length; i++) {
String name = fieldNames[i];
! if (name == null || name.equals(""))
throw new IllegalArgumentException("Empty or null field name");
Object old = map.put(name, fieldValues[i]);
if (old != null) {
throw new IllegalArgumentException("Duplicate field name: " +
name);
--- 164,174 ----
throw new IllegalArgumentException("Different size arrays");
SortedMap<String, Object> map =
new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
for (int i = 0; i < fieldNames.length; i++) {
String name = fieldNames[i];
! if (name == null || name.isEmpty())
throw new IllegalArgumentException("Empty or null field name");
Object old = map.put(name, fieldValues[i]);
if (old != null) {
throw new IllegalArgumentException("Duplicate field name: " +
name);
*** 331,341 ****
if (fieldNames == null)
return values.clone();
Object[] result = new Object[fieldNames.length];
for (int i = 0; i < fieldNames.length; i++) {
String name = fieldNames[i];
! if (name != null && !name.equals(""))
result[i] = getFieldValue(name);
}
return result;
}
--- 331,341 ----
if (fieldNames == null)
return values.clone();
Object[] result = new Object[fieldNames.length];
for (int i = 0; i < fieldNames.length; i++) {
String name = fieldNames[i];
! if (name != null && !name.isEmpty())
result[i] = getFieldValue(name);
}
return result;
}
*** 541,551 ****
else
return d;
}
private static void checkIllegalFieldName(String name) {
! if (name == null || name.equals(""))
illegal("Null or empty field name");
}
private static void unsupported() {
UnsupportedOperationException uoe =
--- 541,551 ----
else
return d;
}
private static void checkIllegalFieldName(String name) {
! if (name == null || name.isEmpty())
illegal("Null or empty field name");
}
private static void unsupported() {
UnsupportedOperationException uoe =
< prev index next >