You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mu...@apache.org on 2006/06/02 20:48:50 UTC
svn commit: r411238 -
/xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
Author: mullan
Date: Fri Jun 2 11:48:49 2006
New Revision: 411238
URL: http://svn.apache.org/viewvc?rev=411238&view=rev
Log:
Fix findbugs bugs:
XMLX509IssuerSerial defines equals and uses Object.hashCode()
Possible null pointer dereference in equals().
Modified:
xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
Modified: xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java?rev=411238&r1=411237&r2=411238&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java Fri Jun 2 11:48:49 2006
@@ -151,23 +151,27 @@
Constants.SignatureSpecNS));
}
- /** @inheritDoc */
- public boolean equals(Object obj) {
+ /** @inheritDoc */
+ public boolean equals(Object obj) {
- if (!obj.getClass().getName().equals(this.getClass().getName())) {
- return false;
- }
+ if (obj == null) {
+ return false;
+ }
+ if (!this.getClass().getName().equals(obj.getClass().getName())) {
+ return false;
+ }
- XMLX509IssuerSerial other = (XMLX509IssuerSerial) obj;
+ XMLX509IssuerSerial other = (XMLX509IssuerSerial) obj;
+ return this.getSerialNumber().equals(other.getSerialNumber())
+ && this.getIssuerName().equals(other.getIssuerName());
+ }
- if (other.getSerialNumber().equals(this.getSerialNumber())
- && other.getIssuerName().equals(this.getIssuerName())) {
- return true;
- }
-
- return false;
- }
+ public int hashCode() {
+ // uncomment when JDK 1.4 is required
+ // assert false : "hashCode not designed";
+ return 82;
+ }
/** @inheritDoc */
public String getBaseLocalName() {