Merge "Signature: remove unnecessary throw on clone"

2 files changed, 3 insertions, 17 deletions

diff --git a/luni/src/main/java/java/security/Signature.java b/luni/src/main/java/java/security/Signature.java
index 24f5298..7dd7d93 100644
--- a/luni/src/main/java/java/security/Signature.java
+++ b/luni/src/main/java/java/security/Signature.java
@@ -624,14 +624,6 @@ public abstract class Signature extends SignatureSpi {
         return engineGetParameter(param);
     }
 
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        if (this instanceof Cloneable) {
-            return super.clone();
-        }
-        throw new CloneNotSupportedException();
-    }
-
     /**
      * Internal Signature implementation
      */
@@ -711,11 +703,8 @@ public abstract class Signature extends SignatureSpi {
 
         @Override
         public Object clone() throws CloneNotSupportedException {
-            if (spiImpl instanceof Cloneable) {
-                SignatureSpi spi = (SignatureSpi) spiImpl.clone();
-                return new SignatureImpl(getAlgorithm(), getProvider(), spiImpl);
-            }
-            throw new CloneNotSupportedException();
+            SignatureSpi spi = (SignatureSpi) spiImpl.clone();
+            return new SignatureImpl(getAlgorithm(), getProvider(), spi);
         }
 
         /**
diff --git a/luni/src/main/java/java/security/SignatureSpi.java b/luni/src/main/java/java/security/SignatureSpi.java
index 27be30c..66c43d7 100644
--- a/luni/src/main/java/java/security/SignatureSpi.java
+++ b/luni/src/main/java/java/security/SignatureSpi.java
@@ -307,9 +307,6 @@ public abstract class SignatureSpi {
 
     @Override
     public Object clone() throws CloneNotSupportedException {
-        if (this instanceof Cloneable) {
-            return super.clone();
-        }
-        throw new CloneNotSupportedException();
+        return super.clone();
     }
 }