Author: sergeyb
Date: Thu Jul 12 12:25:06 2012
New Revision: 1360655
URL: http://svn.apache.org/viewvc?rev=1360655&view=rev
Log:
Merged revisions 1360442 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1360442 | sergeyb | 2012-07-11 23:16:50 +0100 (Wed, 11 Jul 2012) | 1 line
Minor updates to a couple of sp providers
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1360442
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java?rev=1360655&r1=1360654&r2=1360655&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
(original)
+++
cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
Thu Jul 12 12:25:06 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/branches/2.6.x-fixes/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/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java?rev=1360655&r1=1360654&r2=1360655&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java
(original)
+++
cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java
Thu Jul 12 12:25:06 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}")
