* java/security/SecureClassLoader.java (defineClass): Method returns

       Class<?>.
       * java/security/SignatureSpi.java (engineUpdate(ByteBuffer):
       Does not throw SignatureException. Chain SignatureException inside
       IllegalStateException.

2 files changed, 11 insertions, 4 deletions

diff --git a/java/security/SecureClassLoader.java b/java/security/SecureClassLoader.java
index dfc1758b5..f683f9a70 100644
--- a/java/security/SecureClassLoader.java
+++ b/java/security/SecureClassLoader.java
@@ -99,7 +99,7 @@ public class SecureClassLoader extends ClassLoader
    *
    * @since 1.5
    */
-  protected final Class defineClass(String name, ByteBuffer b, CodeSource cs)
+  protected final Class<?> defineClass(String name, ByteBuffer b, CodeSource cs)
   {
     return super.defineClass(name, b, getProtectionDomain(cs));
   }
diff --git a/java/security/SignatureSpi.java b/java/security/SignatureSpi.java
index 3b46815ec..80ecbfd44 100644
--- a/java/security/SignatureSpi.java
+++ b/java/security/SignatureSpi.java
@@ -136,16 +136,23 @@ public abstract class SignatureSpi
    * bytes of the given buffer.
    * 
    * @param input The input buffer.
-   * @throws SignatureException
+   * @throws IllegalStateException if the engine is not properly initialized.
    */
-  protected void engineUpdate(ByteBuffer input) throws SignatureException
+  protected void engineUpdate(ByteBuffer input)
   {
     byte[] buf = new byte[4096];
     while (input.hasRemaining())
       {
         int l = Math.min(input.remaining(), buf.length);
         input.get(buf, 0, l);
-        engineUpdate(buf, 0, l);
+        try
+          {
+            engineUpdate(buf, 0, l);
+          }
+        catch (SignatureException se)
+          {
+            throw new IllegalStateException(se);
+          }
       }
   }