Repository: cayenne Updated Branches: refs/heads/master 5734d0178 -> a27eda27f
an attempt to resolve occasional failures : NestedDataContext_DeadlockIT.testDeadlock:94 Deadlocked thread Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f14c79c7 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f14c79c7 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f14c79c7 Branch: refs/heads/master Commit: f14c79c71a4e2ca71f9223f42e80dca63ed868d4 Parents: 5734d01 Author: aadamchik <aadamc...@apache.org> Authored: Sun Nov 30 15:56:06 2014 +0300 Committer: aadamchik <aadamc...@apache.org> Committed: Sun Nov 30 15:56:06 2014 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/access/NestedDataContext_DeadlockIT.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/f14c79c7/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java index 6d7a21a..1ba83e7 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java @@ -122,6 +122,9 @@ public class NestedDataContext_DeadlockIT extends ServerCase { } nestedContext.commitChanges(); + + // ensure other threads get a chance to run too + Thread.yield(); } } }
