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 2014/02/28 17:09:21 UTC
[1/2] git commit: Preventing possible ThreadLocalClientState NPE
Repository: cxf
Updated Branches:
refs/heads/master 07108f9a1 -> 9423ee7e1
Preventing possible ThreadLocalClientState NPE
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d86d201d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d86d201d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d86d201d
Branch: refs/heads/master
Commit: d86d201d00092876a06176638d520fce94e58d89
Parents: 276343f
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Fri Feb 28 16:08:43 2014 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Fri Feb 28 16:08:43 2014 +0000
----------------------------------------------------------------------
.../org/apache/cxf/jaxrs/client/ThreadLocalClientState.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d86d201d/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java
index 033a139..7155941 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java
@@ -120,6 +120,7 @@ public class ThreadLocalClientState implements ClientState {
cs = new LocalClientState(initialState);
state.put(Thread.currentThread(), cs);
if (timeToKeepState > 0) {
+ prepareCheckpointMap();
long currentTime = System.currentTimeMillis();
checkpointMap.put(Thread.currentThread(), currentTime);
new CleanupThread(Thread.currentThread(), currentTime).start();
@@ -131,10 +132,16 @@ public class ThreadLocalClientState implements ClientState {
public void setTimeToKeepState(long timeToKeepState) {
this.timeToKeepState = timeToKeepState;
if (timeToKeepState > 0) {
- checkpointMap = new ConcurrentHashMap<Thread, Long>();
+ prepareCheckpointMap();
}
}
+ private void prepareCheckpointMap() {
+ if (checkpointMap == null) {
+ checkpointMap = new ConcurrentHashMap<Thread, Long>();
+ }
+ }
+
private class CleanupThread extends Thread {
private Thread thread;
private long originalTime;
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by se...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9423ee7e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9423ee7e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9423ee7e
Branch: refs/heads/master
Commit: 9423ee7e1219b10028b74e79a3f0a672e7d51595
Parents: d86d201 07108f9
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Fri Feb 28 16:09:10 2014 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Fri Feb 28 16:09:10 2014 +0000
----------------------------------------------------------------------
.../AbstractStaxBindingHandler.java | 17 ++++++++
.../AsymmetricBindingHandler.java | 5 ++-
.../StaxAsymmetricBindingHandler.java | 7 +--
.../StaxSymmetricBindingHandler.java | 7 +--
.../ws/bindings/BindingPropertiesTest.java | 28 ++++++++++++
.../systest/ws/bindings/DoubleItBindings.wsdl | 3 ++
.../apache/cxf/systest/ws/bindings/client.xml | 16 +++++++
.../apache/cxf/systest/ws/bindings/server.xml | 14 ++++++
.../sig-conf-enc-before-signing-policy.xml | 46 ++++++++++++++++++++
.../cxf/systest/ws/bindings/stax-server.xml | 15 +++++++
10 files changed, 151 insertions(+), 7 deletions(-)
----------------------------------------------------------------------