Revert "GEODE-8664: Nest errors in DistributionImpl.start (#5725)" (#5742)
This reverts commit f6605e0820ba9b858b8128cd31a03a29067b7710.
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionImpl.java
index bc0ace3..c6713a3 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionImpl.java
@@ -181,9 +181,9 @@
throw new GemFireSecurityException(e.getMessage(),
e);
} catch (MembershipConfigurationException e) {
- throw new GemFireConfigException("Problem configuring membership services", e);
+ throw new GemFireConfigException(e.getMessage());
} catch (MemberStartupException e) {
- throw new SystemConnectException("Problem starting up membership services", e);
+ throw new SystemConnectException(e.getMessage());
} catch (RuntimeException e) {
logger.error("Unexpected problem starting up membership services", e);
throw new SystemConnectException("Problem starting up membership services: " + e.getMessage()
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionTest.java
index 029a5b9..35abb5c 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionTest.java
@@ -15,7 +15,6 @@
package org.apache.geode.distributed.internal;
import static org.apache.geode.distributed.internal.DistributionImpl.EMPTY_MEMBER_ARRAY;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -42,15 +41,11 @@
import org.junit.Before;
import org.junit.Test;
-import org.apache.geode.GemFireConfigException;
-import org.apache.geode.SystemConnectException;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
import org.apache.geode.distributed.internal.direct.DirectChannel;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.distributed.internal.membership.api.MemberStartupException;
import org.apache.geode.distributed.internal.membership.api.Membership;
import org.apache.geode.distributed.internal.membership.api.MembershipClosedException;
-import org.apache.geode.distributed.internal.membership.api.MembershipConfigurationException;
import org.apache.geode.distributed.internal.membership.gms.GMSMembership;
import org.apache.geode.internal.admin.remote.AlertListenerMessage;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
@@ -86,6 +81,7 @@
distribution = new DistributionImpl(clusterDistributionManager,
remoteTransportConfig, internalDistributedSystem, membership);
+
Random r = new Random();
mockMembers = new InternalDistributedMember[5];
for (int i = 0; i < mockMembers.length; i++) {
@@ -208,24 +204,4 @@
distribution.send(emptyList, m);
verify(membership, never()).send(any(), any());
}
-
- @Test
- public void testExceptionNestedOnStartConfigError() throws Exception {
- Throwable exception = new MembershipConfigurationException("Test exception");
- doThrow(exception).when(membership).start();
-
- assertThatThrownBy(() -> distribution.start())
- .isInstanceOf(GemFireConfigException.class)
- .hasCause(exception);
- }
-
- @Test
- public void testExceptionNestedOnStartStartupError() throws Exception {
- Throwable exception = new MemberStartupException("Test exception");
- doThrow(exception).when(membership).start();
-
- assertThatThrownBy(() -> distribution.start())
- .isInstanceOf(SystemConnectException.class)
- .hasCause(exception);
- }
}
