Author: ruchith
Date: Sat Mar 1 03:15:16 2008
New Revision: 14387
Log:
Making sure we aviod an NPE
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/resources.properties
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenVerifier.java
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/resources.properties
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/resources.properties
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/resources.properties
Sat Mar 1 03:15:16 2008
@@ -48,4 +48,5 @@
cardIssuerInitializationFailure=Card issuer initialization failed
profileRetrievalError=Error occurred while retrieving user profiles
errorExtractingCertFromTrustStore = Error extracting certificate : {0} from
trust store
-SAMLTokenConsumerBootstrapFailure = SAMLTokenConsumer bootstrap failure
\ No newline at end of file
+SAMLTokenConsumerBootstrapFailure = SAMLTokenConsumer bootstrap failure
+invalidTokenType = Invalid token type : {0}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenVerifier.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenVerifier.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenVerifier.java
Sat Mar 1 03:15:16 2008
@@ -155,8 +155,11 @@
holder = new SAML1TokenHolder();
} else if (version.equals(IdentityConstants.SAML20_URL)) {
holder = new SAML2TokenHolder();
+ } else {
+ throw new RelyingPartyException("invalidTokenType", new
String [] { version });
}
+
holder.createToken(decryptedElem);
issuerName = holder.getIssuerName();
if (issuerName == null) {
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
