Author: dehort Date: 2012-07-10 15:29:16 -0400 (Tue, 10 Jul 2012) New Revision: 1566 Modified: product/branches/2.0.2_JBPAPP-9307/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java Log: Backporting PLFED-247 to 2.0.2 [JBPAPP-9307] Modified: product/branches/2.0.2_JBPAPP-9307/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java =================================================================== --- product/branches/2.0.2_JBPAPP-9307/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2012-07-10 19:14:58 UTC (rev 1565) +++ product/branches/2.0.2_JBPAPP-9307/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2012-07-10 19:29:16 UTC (rev 1566) @@ -1077,9 +1077,9 @@ log.info("Did not find picketlink-sts.xml. We will install default configuration"); sts.installDefaultConfiguration(); } - else - sts.installDefaultConfiguration(configPath); - + else + sts.installDefaultConfiguration(stsTokenConfigFile.toURI().toString()); + if (this.signOutgoingMessages) { KeyProviderType keyProvider = this.idpConfiguration.getKeyProvider();