--- old/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java	2013-06-28 11:35:02.679654885 -0400
+++ new/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java	2013-06-28 11:35:02.511660114 -0400
@@ -2,27 +2,29 @@
  * reserved comment block
  * DO NOT REMOVE OR ALTER!
  */
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 /*
  * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
  */
 /*
- * $Id: DOMX509IssuerSerial.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
+ * $Id: DOMX509IssuerSerial.java 1333415 2012-05-03 12:03:51Z coheigea $
  */
 package org.jcp.xml.dsig.internal.dom;
 
@@ -42,23 +44,23 @@
  *
  * @author Sean Mullan
  */
-public final class DOMX509IssuerSerial extends DOMStructure
+public final class DOMX509IssuerSerial extends DOMStructure 
     implements X509IssuerSerial {
 
     private final String issuerName;
     private final BigInteger serialNumber;
 
     /**
-     * Creates a <code>DOMX509IssuerSerial</code> containing the specified
+     * Creates a <code>DOMX509IssuerSerial</code> containing the specified 
      * issuer distinguished name/serial number pair.
      *
-     * @param issuerName the X.509 issuer distinguished name in RFC 2253
+     * @param issuerName the X.509 issuer distinguished name in RFC 2253 
      *    String format
      * @param serialNumber the serial number
      * @throws IllegalArgumentException if the format of <code>issuerName</code>
      *    is not RFC 2253 compliant
-     * @throws NullPointerException if <code>issuerName</code> or
-     *    <code>serialNumber</code> is <code>null</code>
+     * @throws NullPointerException if <code>issuerName</code> or 
+     *    <code>serialNumber</code> is <code>null</code> 
      */
     public DOMX509IssuerSerial(String issuerName, BigInteger serialNumber) {
         if (issuerName == null) {
@@ -94,15 +96,16 @@
     }
 
     public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
-        throws MarshalException {
+        throws MarshalException
+    {
         Document ownerDoc = DOMUtils.getOwnerDocument(parent);
 
-        Element isElem = DOMUtils.createElement
-            (ownerDoc, "X509IssuerSerial", XMLSignature.XMLNS, dsPrefix);
-        Element inElem = DOMUtils.createElement
-            (ownerDoc, "X509IssuerName", XMLSignature.XMLNS, dsPrefix);
-        Element snElem = DOMUtils.createElement
-            (ownerDoc, "X509SerialNumber", XMLSignature.XMLNS, dsPrefix);
+        Element isElem = DOMUtils.createElement(ownerDoc, "X509IssuerSerial",
+                                                XMLSignature.XMLNS, dsPrefix);
+        Element inElem = DOMUtils.createElement(ownerDoc, "X509IssuerName",
+                                                XMLSignature.XMLNS, dsPrefix);
+        Element snElem = DOMUtils.createElement(ownerDoc, "X509SerialNumber",
+                                                XMLSignature.XMLNS, dsPrefix);
         inElem.appendChild(ownerDoc.createTextNode(issuerName));
         snElem.appendChild(ownerDoc.createTextNode(serialNumber.toString()));
         isElem.appendChild(inElem);
@@ -110,6 +113,7 @@
         parent.appendChild(isElem);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -117,8 +121,17 @@
         if (!(obj instanceof X509IssuerSerial)) {
             return false;
         }
-        X509IssuerSerial ois = (X509IssuerSerial) obj;
+        X509IssuerSerial ois = (X509IssuerSerial)obj;
         return (issuerName.equals(ois.getIssuerName()) &&
-            serialNumber.equals(ois.getSerialNumber()));
+                serialNumber.equals(ois.getSerialNumber()));
+    }
+    
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + issuerName.hashCode();
+        result = 31 * result + serialNumber.hashCode();
+        
+        return result;
     }
 }