Author: anil.saldhana(a)jboss.com Date: 2009-06-02 14:48:47 -0400 (Tue, 02 Jun 2009) New Revision: 552 Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/KeyUtil.java Log: null arg checks Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-06-02 05:29:57 UTC (rev 551) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-06-02 18:48:47 UTC (rev 552) @@ -159,6 +159,10 @@ if(ks == null) throw new IllegalStateException("KeyStore is null"); + + if(alias == null || alias.length() == 0) + throw new IllegalArgumentException("Alias is null"); + return ks.getCertificate(alias); } catch (KeyStoreException e) Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/KeyUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/KeyUtil.java 2009-06-02 05:29:57 UTC (rev 551) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/KeyUtil.java 2009-06-02 18:48:47 UTC (rev 552) @@ -69,6 +69,9 @@ */ public static KeyInfoType getKeyInfo(Certificate certificate) throws JAXBException, CertificateException { + if(certificate == null) + throw new IllegalArgumentException("certificate is null"); + StringBuilder builder = new StringBuilder(); if(certificate instanceof X509Certificate)