You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/05/01 11:29:35 UTC
[cxf] branch 3.2.x-fixes updated (d880b69 -> 7091d4d)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from d880b69 Adding more StaxUtils tests
new 2eeab3e fix: pass 'maxInactiveInterval' though overloaded methods (#667)
new 7091d4d Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 3 +++
.../main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7091d4dd8a08cbeaa62aad6cb4624d27b1315d1a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri May 1 12:23:44 2020 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4f034c5..8a7145a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -164,6 +164,7 @@ B 2db1206ab6ae5db6fefe9adf0f6df837b0dd8e65
B 2dc596017e24b79bc66bff7a91453908ccf2e7a2
B 2dd40f3371e8c8ad1058be0f8f261af10f4eaff3
B 2de1581c42267dd5d54f8bdfed5784151d7ac26e
+B 2e31d92338e7bc0deda8fd4e5badd425ed2917e7
B 2e44ce12233c213b5fef8bbc28d71554554a8fbb
B 2e6a14e5ea087eb599415980d21861313f333583
B 2f193c43cfded7020733cd874c6428fe7a35ab02
@@ -363,6 +364,7 @@ B 60b0165afccb03816ada90271d1bfc66a6c2eb52
B 60c4c6418a285d71fc197dc953332d987e7651d9
B 612b03ea00b8a9e747411dbfa9a4eb1c6ff4b529
B 6145872b354dac9ee6dfd16fd6481e85af6f2732
+B 6154de4ac9f855efb335e47752201c90e11177ca
B 61605d1675c18e50637240c5a4777babddb53ff1
B 6164978911c5953c9bda3d3880bfa579c8721742
B 616a6ebf45b8ed61e2ec7176b7c263d7dbbab335
@@ -680,6 +682,7 @@ B bdd121031c94f9b1c25151c99c12973a2a51d360
B be61232f3ecb05686ab1fced52600c9dbd7c69f4
B bead97b8f50c2fff5cfab29d88354769d726b94e
B beba07f0d03592ff7b5208bbbc334db72172a56c
+B bf0db565fe03d11386494febb4c4cd46bff7d0dc
B bfa6602337670e70fbc7f215e0c675fe5e1f02ee
B bfdf209e171ac16e6ae962fd8ef0bf7356c7898d
B bff521fc91218248e809b23e292fbaa4747cb36c
[cxf] 01/02: fix: pass 'maxInactiveInterval' though overloaded
methods (#667)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2eeab3e5373e9b71fe44781b0b3751dbcff1aa19
Author: ParanoidUser <pi...@gmail.com>
AuthorDate: Fri May 1 01:42:41 2020 -0700
fix: pass 'maxInactiveInterval' though overloaded methods (#667)
Specify custom session timeout for javax.servlet.http.HttpSession
(cherry picked from commit d6be151f1902e50021cc806fc1ddf5673a50fa7f)
(cherry picked from commit 3135dd0516466448b9d3aa90a000c146b5e45b62)
---
.../main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
index 5162c1d..e25fe54 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
@@ -167,13 +167,13 @@ public final class OAuthUtils {
return setSessionToken(mc, 0);
}
public static String setSessionToken(MessageContext mc, int maxInactiveInterval) {
- return setSessionToken(mc, generateRandomTokenKey());
+ return setSessionToken(mc, generateRandomTokenKey(), maxInactiveInterval);
}
public static String setSessionToken(MessageContext mc, String sessionToken) {
return setSessionToken(mc, sessionToken, 0);
}
public static String setSessionToken(MessageContext mc, String sessionToken, int maxInactiveInterval) {
- return setSessionToken(mc, sessionToken, null, 0);
+ return setSessionToken(mc, sessionToken, null, maxInactiveInterval);
}
public static String setSessionToken(MessageContext mc, String sessionToken,
String attribute, int maxInactiveInterval) {