commit 129333fc3b8fce748e00141d368a9297d2d1d1e0
author Matthew Jason Benson <mbenson@apache.org> Fri Jan 03 19:59:30 2014 +0000
committer Matthew Jason Benson <mbenson@apache.org> Fri Jan 03 19:59:30 2014 +0000
tree 33f8d9099381fd42c6eb811fc31f06b345755c24
parent 75036db1f77e6f1c411e289e4b62dc2b93b08981

synchronization

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/branches/version-2.0-work@1555239 13f79535-47bb-0310-9956-ffa450edef68

core/src/main/java/org/apache/commons/proxy2/stub/TrainingContext.java

diff --git a/core/src/main/java/org/apache/commons/proxy2/stub/TrainingContext.java b/core/src/main/java/org/apache/commons/proxy2/stub/TrainingContext.java
index dc964d2..c0ad666 100644
--- a/core/src/main/java/org/apache/commons/proxy2/stub/TrainingContext.java
+++ b/core/src/main/java/org/apache/commons/proxy2/stub/TrainingContext.java
@@ -35,7 +35,7 @@
         return TRAINING_CONTEXT.get();
     }
 
-    static TrainingContext join(ProxyFactory proxyFactory)
+    static synchronized TrainingContext join(ProxyFactory proxyFactory)
     {
         final TrainingContext context = new TrainingContext(proxyFactory);
         TRAINING_CONTEXT.set(context);
@@ -58,13 +58,16 @@
 
     void part()
     {
-        if (resume == null)
+        synchronized (TRAINING_CONTEXT)
         {
-            TRAINING_CONTEXT.remove();
-        }
-        else
-        {
-            TRAINING_CONTEXT.set(resume);
+            if (resume == null)
+            {
+                TRAINING_CONTEXT.remove();
+            }
+            else
+            {
+                TRAINING_CONTEXT.set(resume);
+            }
         }
     }