findbugs
diff -r f8bd16045000 src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
@@ -289,6 +289,7 @@
}
}
+ if (e == null) return null;
List parents=new ArrayList(10);
//Obtain all the parents of the elemnt
diff -r f8bd16045000 src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
--- a/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
+++ b/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
@@ -202,9 +202,7 @@
confirmation.initialValue); /* initialValue */
/* Perform the OK actions */
- if (result == JOptionPane.OK_OPTION
- || result == JOptionPane.YES_OPTION)
- {
+ if (result == JOptionPane.OK_OPTION) { // YES_OPTION is also 0
Iterator<Action> iterator = okActions.iterator();
while (iterator.hasNext()) {
iterator.next().perform();
diff -r f8bd16045000 src/share/classes/com/sun/security/auth/login/ConfigFile.java
--- a/src/share/classes/com/sun/security/auth/login/ConfigFile.java
+++ b/src/share/classes/com/sun/security/auth/login/ConfigFile.java
@@ -105,7 +105,7 @@
*/
public ConfigFile() {
try {
- init(url);
+ init(null);
} catch (IOException ioe) {
throw (SecurityException)
new SecurityException(ioe.getMessage()).initCause(ioe);
diff -r f8bd16045000 src/share/classes/java/security/cert/X509CRLSelector.java
--- a/src/share/classes/java/security/cert/X509CRLSelector.java
+++ b/src/share/classes/java/security/cert/X509CRLSelector.java
@@ -609,6 +609,7 @@
if (debug != null) {
debug.println("X509CRLSelector.match: no CRLNumber");
}
+ return false;
}
BigInteger crlNum;
try {
diff -r f8bd16045000 src/share/classes/sun/security/util/DerOutputStream.java
--- a/src/share/classes/sun/security/util/DerOutputStream.java
+++ b/src/share/classes/sun/security/util/DerOutputStream.java
@@ -200,12 +200,12 @@
// Reduce them to the least number of bytes needed to
// represent this int
- if (bytes[0] == 0xff) {
+ if (bytes[0] == (byte)0xff) {
// Eliminate redundant 0xff
for (int j = 0; j < 3; j++) {
- if ((bytes[j] == 0xff) &&
+ if ((bytes[j] == (byte)0xff) &&
((bytes[j+1] & 0x80) == 0x80))
start++;
else
diff -r f8bd16045000 src/share/classes/sun/security/util/Password.java
--- a/src/share/classes/sun/security/util/Password.java
+++ b/src/share/classes/sun/security/util/Password.java
@@ -48,7 +48,7 @@
consoleEntered = con.readPassword();
// readPassword returns "" if you just print ENTER,
// to be compatible with old Password class, change to null
- if (consoleEntered != null && consoleEntered.length == 0) {
+ if (consoleEntered == null || consoleEntered.length == 0) {
return null;
}
consoleBytes = convertToBytes(consoleEntered);