Revert "Recover exceptions wrapped in same class correctly"

This reverts commit 3fb90fd
hazelcast · Sep 11, 2020 · 9e8aeae · 9e8aeae
1 parent fe3201c
commit 9e8aeae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/clientside/ClientExceptionFactory.java b/hazelcast/src/main/java/com/hazelcast/client/impl/clientside/ClientExceptionFactory.java
@@ -709,11 +709,7 @@ private Throwable createException(Iterator<ErrorHolder> iterator) {
         if (exceptionFactory == null) {
             throwable = new UndefinedErrorCodeException(errorHolder.getMessage(), errorHolder.getClassName());
         } else {
-            Throwable cause = createException(iterator);
-            throwable = exceptionFactory.createException(errorHolder.getMessage(), cause);
-            if (throwable.getCause() == null && cause != null) {
-                throwable.initCause(cause);
-            }
+            throwable = exceptionFactory.createException(errorHolder.getMessage(), createException(iterator));
         }
         throwable.setStackTrace(errorHolder.getStackTraceElements().toArray(new StackTraceElement[0]));
         return throwable;

diff --git a/hazelcast/src/test/java/com/hazelcast/client/impl/protocol/ClientExceptionFactoryTest.java b/hazelcast/src/test/java/com/hazelcast/client/impl/protocol/ClientExceptionFactoryTest.java
@@ -34,7 +34,6 @@
 import com.hazelcast.crdt.TargetNotReplicaException;
 import com.hazelcast.durableexecutor.StaleTaskIdException;
 import com.hazelcast.internal.cluster.impl.ConfigMismatchException;
-import com.hazelcast.internal.util.ExceptionUtil;
 import com.hazelcast.map.QueryResultSizeExceededException;
 import com.hazelcast.map.ReachedMaxSizeException;
 import com.hazelcast.memory.NativeOutOfMemoryError;
@@ -273,8 +272,7 @@ public static Iterable<Object[]> parameters() {
                 new Object[]{new IndeterminateOperationStateException(randomString())},
                 new Object[]{new TargetNotReplicaException(randomString())},
                 new Object[]{new MutationDisallowedException(randomString())},
-                new Object[]{new ConsistencyLostException(randomString())},
-                new Object[]{ExceptionUtil.tryWrapInSameClass(new NullPointerException())}
+                new Object[]{new ConsistencyLostException(randomString())}
         );
     }
 }