Merge "X509Certificate: Narrow down the scope of caught exceptions."

2 files changed, 3 insertions, 3 deletions

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/X509CertificateTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/X509CertificateTest.java
index 64bfbb3..26403f5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/X509CertificateTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/X509CertificateTest.java
@@ -20,7 +20,7 @@
  * @version $Revision$
  */
 
-package tests.api.javax.security.cert;
+package org.apache.harmony.tests.javax.security.cert;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
diff --git a/luni/src/main/java/javax/security/cert/X509Certificate.java b/luni/src/main/java/javax/security/cert/X509Certificate.java
index e85a556..5084ae0 100644
--- a/luni/src/main/java/javax/security/cert/X509Certificate.java
+++ b/luni/src/main/java/javax/security/cert/X509Certificate.java
@@ -51,7 +51,7 @@ public abstract class X509Certificate extends Certificate {
             String classname = Security.getProperty("cert.provider.x509v1");
             Class cl = Class.forName(classname);
             constructor = cl.getConstructor(new Class[] {InputStream.class});
-        } catch (Throwable e) {
+        } catch (Exception|LinkageError e) {
         }
     }
 
@@ -80,7 +80,7 @@ public abstract class X509Certificate extends Certificate {
             try {
                 return (X509Certificate)
                     constructor.newInstance(new Object[] {inStream});
-            } catch (Throwable e) {
+            } catch (ReflectiveOperationException e) {
                 throw new CertificateException(e.getMessage());
             }
         }