don't throw exception if promise is already resolved or rejected

dungba88 · Nov 10, 2018 · bf94110 · bf94110
1 parent 6246a51
commit bf94110
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/joo/promise4j/impl/AsyncDeferredObject.java b/src/main/java/org/joo/promise4j/impl/AsyncDeferredObject.java
@@ -45,7 +45,7 @@ public AsyncDeferredObject() {
 	@Override
 	public Deferred<D, F> resolve(final D result) {
 		if (!done.compareAndSet(false, true))
-			throw new IllegalStateException("Deferred is already resolved or rejected");
+			return this;
 		this.result = result;
 		this.status = DeferredStatus.RESOLVED;
 		this.onComplete(result);
@@ -55,7 +55,7 @@ public Deferred<D, F> resolve(final D result) {
 	@Override
 	public Deferred<D, F> reject(final F failedCause) {
 		if (!done.compareAndSet(false, true))
-			throw new IllegalStateException("Deferred is already resolved or rejected");
+			return this;
 		this.failedCause = failedCause;
 		this.status = DeferredStatus.REJECTED;
 		this.onFail(failedCause);

diff --git a/src/main/java/org/joo/promise4j/impl/SyncDeferredObject.java b/src/main/java/org/joo/promise4j/impl/SyncDeferredObject.java
@@ -32,7 +32,7 @@ public class SyncDeferredObject<D, F extends Throwable> extends AbstractPromise<
 	public Deferred<D, F> resolve(final D resolve) {
 		synchronized (this) {
 			if (!isPending())
-				throw new IllegalStateException("Deferred is already resolved or rejected");
+				return this;
 
 			this.status = DeferredStatus.RESOLVED;
 			this.result = resolve;
@@ -46,7 +46,7 @@ public Deferred<D, F> resolve(final D resolve) {
 	public Deferred<D, F> reject(final F reject) {
 		synchronized (this) {
 			if (!isPending())
-				throw new IllegalStateException("Deferred is already resolved or rejected");
+				return this;
 
 			this.status = DeferredStatus.REJECTED;
 			this.failedCause = reject;