You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2018/12/19 12:58:40 UTC
[1/2] james-project git commit: JAMES-2624 use
CompletableFutureUtil.exceptionallyFuture instead of a hack
Repository: james-project
Updated Branches:
refs/heads/master 544924a9c -> e0da389a8
JAMES-2624 use CompletableFutureUtil.exceptionallyFuture instead of a hack
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9510a2d9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9510a2d9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9510a2d9
Branch: refs/heads/master
Commit: 9510a2d928f13103778f482f3b172333172eb987
Parents: eeafbf4
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Dec 14 14:38:01 2018 +0100
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Mon Dec 17 15:37:27 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/james/blob/memory/MemoryBlobStore.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/9510a2d9/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java
----------------------------------------------------------------------
diff --git a/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java b/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java
index 20c1fef..c76b975 100644
--- a/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java
+++ b/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java
@@ -25,12 +25,12 @@ import java.io.InputStream;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
import org.apache.commons.io.IOUtils;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.ObjectStoreException;
+import org.apache.james.util.CompletableFutureUtil;
import com.google.common.base.Preconditions;
@@ -69,10 +69,7 @@ public class MemoryBlobStore implements BlobStore {
try {
return CompletableFuture.completedFuture(retrieveStoredValue(blobId));
} catch (ObjectStoreException e) {
- Supplier<byte[]> throwing = () -> {
- throw e;
- };
- return CompletableFuture.supplyAsync(throwing);
+ return CompletableFutureUtil.exceptionallyFuture(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: Merge remote-tracking branch
'mbaechler/JAMES-2624-completablefuture-fixup'
Posted by ro...@apache.org.
Merge remote-tracking branch 'mbaechler/JAMES-2624-completablefuture-fixup'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e0da389a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e0da389a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e0da389a
Branch: refs/heads/master
Commit: e0da389a896a675b7c2f69acfe89b210b6ed7806
Parents: 544924a 9510a2d
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Wed Dec 19 13:57:50 2018 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Wed Dec 19 13:57:50 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/james/blob/memory/MemoryBlobStore.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org