diff options
| author | Brian Vosburgh | 2015-10-27 18:41:28 +0000 |
|---|---|---|
| committer | Brian Vosburgh | 2015-10-27 18:41:28 +0000 |
| commit | c08e39d71d1436e96ef5ffb62e67600b1c3c6842 (patch) | |
| tree | 28928f17b7c19915e07b77ff3107cba1f76a3e91 /common/plugins/org.eclipse.jpt.common.utility/src/org | |
| parent | d0cee112178efe7228b5b150221014d980a2d78c (diff) | |
| download | webtools.dali-c08e39d71d1436e96ef5ffb62e67600b1c3c6842.tar.gz webtools.dali-c08e39d71d1436e96ef5ffb62e67600b1c3c6842.tar.xz webtools.dali-c08e39d71d1436e96ef5ffb62e67600b1c3c6842.zip | |
more Boolean/Int/ObjectReference tests
Diffstat (limited to 'common/plugins/org.eclipse.jpt.common.utility/src/org')
| -rw-r--r-- | common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/reference/SynchronizedObject.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/reference/SynchronizedObject.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/reference/SynchronizedObject.java index 037cb64482..b6d9309ad4 100644 --- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/reference/SynchronizedObject.java +++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/reference/SynchronizedObject.java @@ -241,7 +241,8 @@ public class SynchronizedObject<V> return thisValue; // nothing changes } other.setChangedValue_(thisValue); - return this.setChangedValue_(otherValue); + this.setChangedValue_(otherValue); + return otherValue; } } } @@ -573,7 +574,7 @@ public class SynchronizedObject<V> * Return the previous value. * If the time-out is zero, wait indefinitely. */ - public boolean waitToSwap(V newValue, V expectedValue, long timeout) throws InterruptedException { + public boolean waitToCommit(V newValue, V expectedValue, long timeout) throws InterruptedException { synchronized (this.mutex) { boolean success = this.waitUntil_(PredicateTools.isEqual(expectedValue), timeout); if (success) { |