Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authormullan
Wed, 16 Jul 2014 08:07:38 -0400
changeset 25525 4ef885b4c7c6
parent 25524 e623ca817d50 (diff)
parent 25523 c751d1010164 (current diff)
child 25526 d3cbdae6e9f9
Merge
--- a/jdk/src/share/classes/java/security/SignedObject.java	Wed Jul 16 13:02:24 2014 +0400
+++ b/jdk/src/share/classes/java/security/SignedObject.java	Wed Jul 16 08:07:38 2014 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -211,7 +211,9 @@
      * @param verificationKey the public key for verification.
      * @param verificationEngine the signature verification engine.
      *
-     * @exception SignatureException if signature verification failed.
+     * @exception SignatureException if signature verification failed (an
+     *     exception prevented the signature verification engine from completing
+     *     normally).
      * @exception InvalidKeyException if the verification key is invalid.
      *
      * @return {@code true} if the signature
jdk-sandbox