You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/07/12 00:16:50 UTC
svn commit: r1360442 - in
/cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso:
EHCacheTokenReplayCache.java state/HTTPSPStateManager.java
Author: sergeyb
Date: Wed Jul 11 22:16:50 2012
New Revision: 1360442
URL: http://svn.apache.org/viewvc?rev=1360442&view=rev
Log:
Minor updates to a couple of sp providers
Modified:
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java
Modified: cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java?rev=1360442&r1=1360441&r2=1360442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java (original)
+++ cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java Wed Jul 11 22:16:50 2012
@@ -68,6 +68,9 @@ public class EHCacheTokenReplayCache imp
}
private void createCache(String configFile, Bus bus) {
+ if (bus == null) {
+ bus = BusFactory.getThreadDefaultBus(true);
+ }
URL configFileURL = null;
try {
configFileURL =
@@ -75,9 +78,6 @@ public class EHCacheTokenReplayCache imp
} catch (Exception ex) {
// ignore
}
- if (bus == null) {
- bus = BusFactory.getThreadDefaultBus(true);
- }
if (configFileURL == null) {
cacheManager = CacheManager.create();
} else {
Modified: cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java?rev=1360442&r1=1360441&r2=1360442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java (original)
+++ cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java Wed Jul 11 22:16:50 2012
@@ -31,7 +31,11 @@ import javax.ws.rs.Produces;
@Path("state")
public class HTTPSPStateManager implements SPStateManager {
- private MemorySPStateManager manager = new MemorySPStateManager();
+ private SPStateManager manager = new MemorySPStateManager();
+
+ public void setStateProvider(SPStateManager stateManager) {
+ this.manager = stateManager;
+ }
@POST
@Path("/request/{relayState}")