simplified ArangoCollectionAsyncImpl handleGetDocumentExceptions

arangodb · Aug 28, 2019 · 7361ee4 · 7361ee4
1 parent fa75f4e
commit 7361ee4
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/src/main/java/com/arangodb/internal/ArangoCollectionAsyncImpl.java b/src/main/java/com/arangodb/internal/ArangoCollectionAsyncImpl.java
@@ -34,6 +34,7 @@
 
 /**
  * @author Mark Vollmary
+ * @author Michele Rastelli
  */
 public class ArangoCollectionAsyncImpl
         extends InternalArangoCollection<ArangoDBAsyncImpl, ArangoDatabaseAsyncImpl, ArangoExecutorAsync>
@@ -118,18 +119,8 @@ public <T> CompletableFuture<T> getDocument(
 
     private <T> Function<Throwable, T> handleGetDocumentExceptions(Boolean isCatchException) {
         return throwable -> {
-            ArangoDBException arangoDBException = null;
-
-            if (throwable instanceof ArangoDBException) {
-                arangoDBException = (ArangoDBException) throwable;
-            } else if (throwable instanceof CompletionException) {
-                CompletionException completionException = (CompletionException) throwable;
-                if (completionException.getCause() instanceof ArangoDBException) {
-                    arangoDBException = (ArangoDBException) completionException.getCause();
-                }
-            }
-
-            if (arangoDBException != null) {
+            if (throwable instanceof CompletionException && throwable.getCause() instanceof ArangoDBException) {
+                ArangoDBException arangoDBException = (ArangoDBException) throwable.getCause();
                 if ((arangoDBException.getResponseCode() != null && (arangoDBException.getResponseCode() == 404 || arangoDBException.getResponseCode() == 304
                         || arangoDBException.getResponseCode() == 412)) && isCatchException) {
                     return null;