src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java

*** 1,30 ****
  /*
   * 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
   *
!  *  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 $
   */
  package org.jcp.xml.dsig.internal.dom;
  
  import javax.xml.crypto.*;
  import javax.xml.crypto.dom.DOMCryptoContext;
--- 1,32 ----
  /*
   * reserved comment block
   * DO NOT REMOVE OR ALTER!
   */
! /**
!  * 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
   *
   * 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 1333415 2012-05-03 12:03:51Z coheigea $
   */
  package org.jcp.xml.dsig.internal.dom;
  
  import javax.xml.crypto.*;
  import javax.xml.crypto.dom.DOMCryptoContext;
*** 92,124 ****
      public BigInteger getSerialNumber() {
          return serialNumber;
      }
  
      public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
!         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);
          inElem.appendChild(ownerDoc.createTextNode(issuerName));
          snElem.appendChild(ownerDoc.createTextNode(serialNumber.toString()));
          isElem.appendChild(inElem);
          isElem.appendChild(snElem);
          parent.appendChild(isElem);
      }
  
      public boolean equals(Object obj) {
          if (this == obj) {
              return true;
          }
          if (!(obj instanceof X509IssuerSerial)) {
              return false;
          }
!         X509IssuerSerial ois = (X509IssuerSerial) obj;
          return (issuerName.equals(ois.getIssuerName()) &&
              serialNumber.equals(ois.getSerialNumber()));
      }
  }
--- 94,137 ----
      public BigInteger getSerialNumber() {
          return serialNumber;
      }
  
      public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
!         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);
          inElem.appendChild(ownerDoc.createTextNode(issuerName));
          snElem.appendChild(ownerDoc.createTextNode(serialNumber.toString()));
          isElem.appendChild(inElem);
          isElem.appendChild(snElem);
          parent.appendChild(isElem);
      }
  
+     @Override
      public boolean equals(Object obj) {
          if (this == obj) {
              return true;
          }
          if (!(obj instanceof X509IssuerSerial)) {
              return false;
          }
!         X509IssuerSerial ois = (X509IssuerSerial)obj;
          return (issuerName.equals(ois.getIssuerName()) &&
                  serialNumber.equals(ois.getSerialNumber()));
      }
+     
+     @Override
+     public int hashCode() {
+         int result = 17;
+         result = 31 * result + issuerName.hashCode();
+         result = 31 * result + serialNumber.hashCode();
+         
+         return result;
+     }
  }