Index: modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java =================================================================== --- modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java (revision 449624) +++ modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java (working copy) @@ -25,6 +25,8 @@ import java.security.NoSuchProviderException; import java.security.cert.CertificateException; +import org.apache.harmony.tools.toolutils.KeyStoreLoaderSaver; + /** * The class encapsulates paramaters for Keytool most of which are ususally given * in command line. @@ -890,7 +892,7 @@ NoSuchProviderException, IOException { if (cacerts == null) { String keyStoreProv = (ksProvider != null) ? ksProvider : provider; - cacerts = KeytoolKSLoaderSaver.loadStore(getCacertsPath(), + cacerts = KeyStoreLoaderSaver.loadStore(getCacertsPath(), storeType, getCacertsPass(), keyStoreProv); } return cacerts; Index: modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolKSLoaderSaver.java =================================================================== --- modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolKSLoaderSaver.java (revision 449624) +++ modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolKSLoaderSaver.java (working copy) @@ -35,7 +35,7 @@ /** * Class for loading the main keystore, saving ang changing its password. */ -public class KeytoolKSLoaderSaver extends KeyStoreLoaderSaver{ +public class KeytoolKSLoaderSaver { /** * Creates an instance of class KeyStore and loads a keystore to it. * param.getStorePass() is used to check the integrity of the keystore. If @@ -72,15 +72,17 @@ ksFile = new File(uri); } catch (URISyntaxException e) { ksFile = new File(param.getStorePath()); + } catch (IllegalArgumentException e){ + ksFile = new File(param.getStorePath()); } if (ksFile.exists()) { // load an existing store - keyStore = loadStore(param.getStorePath(), param.getStoreType(), - param.getStorePass(), ksProvider); + keyStore = KeyStoreLoaderSaver.loadStore(param.getStorePath(), + param.getStoreType(), param.getStorePass(), ksProvider); } else { // create a new store if it doesn't exist - keyStore = loadStore(null, param.getStoreType(), param - .getStorePass(), ksProvider); + keyStore = KeyStoreLoaderSaver.loadStore(null, + param.getStoreType(), param.getStorePass(), ksProvider); param.setNeedSaveKS(true); } param.setKeyStore(keyStore); @@ -94,13 +96,13 @@ * @throws NoSuchAlgorithmException * @throws CertificateException * @throws IOException - * @throws NoSuchProviderException + * @throws NoSuchProviderException */ static void saveStore(KeytoolParameters param) throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException, - NoSuchProviderException{ - saveStore(param.getKeyStore(), param.getStorePath(), param - .getStorePass(), param.isVerbose()); + NoSuchProviderException { + KeyStoreLoaderSaver.saveStore(param.getKeyStore(), + param.getStorePath(), param.getStorePass(), param.isVerbose()); } /** Index: modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreConverter.java =================================================================== --- modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreConverter.java (revision 449624) +++ modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreConverter.java (working copy) @@ -25,6 +25,8 @@ import java.security.cert.CertificateException; import java.util.Enumeration; +import org.apache.harmony.tools.toolutils.KeyStoreLoaderSaver; + /** * Class to convert keystore to another format. */ @@ -50,7 +52,7 @@ String ksProvider = (param.getConvKsProvider() != null) ? param .getConvKsProvider() : param.getProvider(); // creating a new keystore - KeyStore convertedKS = KeytoolKSLoaderSaver.loadStore(null, param + KeyStore convertedKS = KeyStoreLoaderSaver.loadStore(null, param .getConvertedKeyStoreType(), param.getConvertedKeyStorePass(), ksProvider); @@ -120,7 +122,7 @@ } // save the converted keystore - KeytoolKSLoaderSaver.saveStore(convertedKS, param + KeyStoreLoaderSaver.saveStore(convertedKS, param .getConvertedKeyStorePath(), param.getConvertedKeyStorePass(), param.isVerbose()); }