Author: dkulp
Date: Tue Sep 20 21:31:14 2011
New Revision: 1173387
URL: http://svn.apache.org/viewvc?rev=1173387&view=rev
Log:
Merged revisions 1173381 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1173381 | dkulp | 2011-09-20 17:19:51 -0400 (Tue, 20 Sep 2011) | 2 lines
Treat the session maintain as a contextual property to allow configuring
it in via spring/blueprint config
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
Propchange: cxf/branches/2.4.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java?rev=1173387&r1=1173386&r2=1173387&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
Tue Sep 20 21:31:14 2011
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
public class Cookies {
/**
@@ -48,8 +49,8 @@ public class Cookies {
public void writeToMessageHeaders(Message message) {
//Do we need to maintain a session?
- maintainSession =
Boolean.TRUE.equals((Boolean)message.get(Message.MAINTAIN_SESSION));
-
+ maintainSession = MessageUtils.getContextualBoolean(message,
Message.MAINTAIN_SESSION, false);
+
//If we have any cookies and we are maintaining sessions, then use
them
if (maintainSession && sessionCookies.size() > 0) {
new Headers(message).writeSessionCookies(sessionCookies);
