--- a/src/java.base/share/classes/java/security/Security.java Thu Dec 13 16:14:07 2018 +0100
+++ b/src/java.base/share/classes/java/security/Security.java Thu Dec 13 15:31:05 2018 +0100
@@ -649,7 +649,7 @@
}
}
- if ((candidates == null) || (candidates.isEmpty()))
+ if (candidates == null || candidates.isEmpty())
return null;
Object[] candidatesArray = candidates.toArray();
@@ -1005,11 +1005,11 @@
String algName = null;
String attrName = null;
- if (filterValue.length() == 0) {
+ if (filterValue.isEmpty()) {
// The filterValue is an empty string. So the filterKey
// should be in the format of <crypto_service>.<algorithm_or_type>.
algName = filterKey.substring(algIndex + 1).trim();
- if (algName.length() == 0) {
+ if (algName.isEmpty()) {
// There must be a algorithm or type name.
throw new InvalidParameterException("Invalid filter");
}
@@ -1024,7 +1024,7 @@
throw new InvalidParameterException("Invalid filter");
} else {
attrName = filterKey.substring(attrIndex + 1).trim();
- if (attrName.length() == 0) {
+ if (attrName.isEmpty()) {
// There is no attribute name in the filter.
throw new InvalidParameterException("Invalid filter");
}
@@ -1070,7 +1070,7 @@
**/
public static Set<String> getAlgorithms(String serviceName) {
- if ((serviceName == null) || (serviceName.length() == 0) ||
+ if ((serviceName == null) || (serviceName.isEmpty()) ||
(serviceName.endsWith("."))) {
return Collections.emptySet();
}