harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r395524 - in /incubator/harmony/enhanced/classlib/trunk/modules/crypto: make/common/build.xml src/main/java/javax/crypto/Cipher.java
Date Thu, 20 Apr 2006 07:44:25 GMT
Author: smishura
Date: Thu Apr 20 00:44:23 2006
New Revision: 395524

URL: http://svn.apache.org/viewcvs?rev=395524&view=rev
Log:
Partial fix for HARMONY-315 (javax.crypto.Cipher.getInstance doesn't match RI exception behaviour.)

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=395524&r1=395523&r2=395524&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Thu Apr
20 00:44:23 2006
@@ -109,14 +109,15 @@
             <!-- public API tests must be separated -->
             <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
 
+            <classpath>
+                <pathelement path="${hy.crypto.src.test.resources}"/>
+            </classpath>
+
             <formatter type="xml" />
 
             <batchtest todir="${hy.tests.reports}" haltonfailure="no">
                 <fileset dir="${hy.crypto.src.test.java}">
                     <include name="**/*Test.java"/>
-
-                    <!-- Harmony exclude list -->
-                    <exclude name="tests/api/javax/crypto/CipherTest.java"/>
                 </fileset>
             </batchtest>
         </junit>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java?rev=395524&r1=395523&r2=395524&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
Thu Apr 20 00:44:23 2006
@@ -146,6 +146,11 @@
     public static final Cipher getInstance(String transformation,
             String provider) throws NoSuchAlgorithmException,
             NoSuchProviderException, NoSuchPaddingException {
+
+        if (provider == null) {
+            throw new IllegalArgumentException("provider is null");
+        }
+
         Provider p = Security.getProvider(provider);
         if (p == null) {
             throw new NoSuchProviderException("Provider " + provider



Mime
View raw message