提交 1c8a75c7 编写于 作者: J juh

8022443: Fix lint warnings in sun.security.pkcs12

Reviewed-by: darcy
上级 4ead3b07
...@@ -775,7 +775,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi { ...@@ -775,7 +775,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
} }
} }
if (params != null) { if (params != null) {
if (algorithm.equals(pbes2_OID)) { if (algorithm.equals((Object)pbes2_OID)) {
algParams = AlgorithmParameters.getInstance("PBES2"); algParams = AlgorithmParameters.getInstance("PBES2");
} else { } else {
algParams = AlgorithmParameters.getInstance("PBE"); algParams = AlgorithmParameters.getInstance("PBE");
...@@ -912,7 +912,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi { ...@@ -912,7 +912,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
private static String mapPBEParamsToAlgorithm(ObjectIdentifier algorithm, private static String mapPBEParamsToAlgorithm(ObjectIdentifier algorithm,
AlgorithmParameters algParams) throws NoSuchAlgorithmException { AlgorithmParameters algParams) throws NoSuchAlgorithmException {
// Check for PBES2 algorithms // Check for PBES2 algorithms
if (algorithm.equals(pbes2_OID) && algParams != null) { if (algorithm.equals((Object)pbes2_OID) && algParams != null) {
return algParams.toString(); return algParams.toString();
} }
return algorithm.toString(); return algorithm.toString();
...@@ -1921,7 +1921,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi { ...@@ -1921,7 +1921,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
} }
safeContentsData = safeContents.getData(); safeContentsData = safeContents.getData();
} else if (contentType.equals(ContentInfo.ENCRYPTED_DATA_OID)) { } else if (contentType.equals((Object)ContentInfo.ENCRYPTED_DATA_OID)) {
if (password == null) { if (password == null) {
continue; continue;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册