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 2016/06/29 17:40:05 UTC
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 53088c159 -> bb556391f
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce565ac7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce565ac7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce565ac7
Branch: refs/heads/3.0.x-fixes
Commit: ce565ac7cf5405f46e2da54602e27fda6c6ffb20
Parents: 53088c1
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jun 29 18:36:53 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jun 29 18:36:53 2016 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ce565ac7/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e66c84a..c057cc8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -110,6 +110,7 @@ B 20076a8c3ee335121dcb580640d8d98f5f48a6d7
B 20467ecea3cb0778bd02e60029d4d4ec7a8a2483
B 20539c0278472689722204f0c08e68a86597aae1
B 205c61c48b2aad973572aa74d8c9dfa83c2dd7bd
+B 206738103f5d783d90695aa2e3e750736746d4c3
B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1
B 22d0c244d3b60aafbd3c070e9599012019de486c
B 2302aa5820661975bb04857fa6d48bb68bebb4f7
[2/2] cxf git commit: NPE fix
Posted by co...@apache.org.
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bb556391
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bb556391
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bb556391
Branch: refs/heads/3.0.x-fixes
Commit: bb556391fc761dbd5f69244238a83d277047ec90
Parents: ce565ac
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jun 29 18:32:14 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jun 29 18:38:51 2016 +0100
----------------------------------------------------------------------
.../oauth2/client/MemoryClientTokenContextManager.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bb556391/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientTokenContextManager.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientTokenContextManager.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientTokenContextManager.java
index da85e11..d9ed8d6 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientTokenContextManager.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientTokenContextManager.java
@@ -37,7 +37,11 @@ public class MemoryClientTokenContextManager implements ClientTokenContextManage
@Override
public ClientTokenContext getClientTokenContext(MessageContext mc) {
- return map.get(getKey(mc, false));
+ String key = getKey(mc, false);
+ if (key != null) {
+ return map.get(key);
+ }
+ return null;
}
@Override