Replace RuntimeException in catch with Exception to support Kotlin (#971)

katcharov · web-flow · commit 79512417f299 · 2022-07-07T08:56:02.000-06:00
Kotlin does not support checked exceptions, so our handlers will use Exception. All handlers are replaced, even those obviously unaffected, for the sake of a consistent noticeable pattern. JAVA-4575
diff --git a/bson/src/test/unit/org/bson/json/JsonReaderTest.java b/bson/src/test/unit/org/bson/json/JsonReaderTest.java
@@ -1308,7 +1308,7 @@ private void testStringAndStream(final String json, final Function<AbstractBsonR
                                      final Class<? extends RuntimeException> exClass) {
         try {
             testFunc.apply(new JsonReader(json));
-        } catch (final RuntimeException e) {
+        } catch (final Exception e) {
             if (exClass == null) {
                 throw e;
             }
@@ -1317,7 +1317,7 @@ private void testStringAndStream(final String json, final Function<AbstractBsonR
         try {
             testFunc.apply(new JsonReader(new InputStreamReader(new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)),
                     StandardCharsets.UTF_8)));
-        } catch (final RuntimeException e) {
+        } catch (final Exception e) {
             if (exClass == null) {
                 throw e;
             }
diff --git a/driver-core/src/main/com/mongodb/connection/TlsChannelStreamFactoryFactory.java b/driver-core/src/main/com/mongodb/connection/TlsChannelStreamFactoryFactory.java
@@ -147,7 +147,7 @@ void start() {
                                         pendingRegistration.attachment);
                                 iter.remove();
                             }
-                        } catch (IOException | RuntimeException e) {
+                        } catch (Exception e) {
                             LOGGER.warn("Exception in selector loop", e);
                         }
                     }
diff --git a/driver-core/src/main/com/mongodb/internal/async/client/ClientSessionBinding.java b/driver-core/src/main/com/mongodb/internal/async/client/ClientSessionBinding.java
@@ -149,7 +149,7 @@ public int release() {
     private void isConnectionSourcePinningRequired(final SingleResultCallback<Boolean> callback) {
         try {
             callback.onResult(isConnectionSourcePinningRequired(), null);
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             callback.onResult(null, e);
         }
     }
diff --git a/driver-core/src/main/com/mongodb/internal/async/function/RetryState.java b/driver-core/src/main/com/mongodb/internal/async/function/RetryState.java
@@ -248,7 +248,7 @@ public void breakAndThrowIfRetryAnd(final Supplier<Boolean> predicate) throws Ru
                 if (predicate.get()) {
                     loopState.markAsLastIteration();
                 }
-            } catch (RuntimeException predicateException) {
+            } catch (Exception predicateException) {
                 predicateException.addSuppressed(localException);
                 throw predicateException;
             }
diff --git a/driver-core/src/main/com/mongodb/internal/async/function/RetryingSyncSupplier.java b/driver-core/src/main/com/mongodb/internal/async/function/RetryingSyncSupplier.java
@@ -65,6 +65,9 @@ public R get() {
                 return syncFunction.get();
             } catch (RuntimeException attemptException) {
                 state.advanceOrThrow(attemptException, failedResultTransformer, retryPredicate);
+            } catch (Exception attemptException) {
+                // wrap potential sneaky / Kotlin exceptions
+                state.advanceOrThrow(new RuntimeException(attemptException), failedResultTransformer, retryPredicate);
             }
         }
     }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/AsynchronousClusterEventListener.java b/driver-core/src/main/com/mongodb/internal/connection/AsynchronousClusterEventListener.java
@@ -169,7 +169,7 @@ private void publishEvents() {
                 if (isLastEvent) {
                     break;
                 }
-            } catch (RuntimeException | InterruptedException e) {
+            } catch (Exception e) {
                 // ignore exceptions thrown from listeners, also ignore interrupts that user code may cause
             }
         }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ConcurrentPool.java b/driver-core/src/main/com/mongodb/internal/connection/ConcurrentPool.java
@@ -219,7 +219,7 @@ private T createNewAndReleasePermitIfFailure() {
                 throw new MongoInternalException("The factory for the pool created a null item");
             }
             return newMember;
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             stateAndPermits.releasePermit();
             throw e;
         }
@@ -277,7 +277,7 @@ public String toString() {
     private void close(final T t) {
         try {
             itemFactory.close(t);
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             // ItemFactory.close() really should not throw
         }
     }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
@@ -178,7 +178,7 @@ public InternalConnection get(final long timeoutValue, final TimeUnit timeUnit)
             }
             connectionPoolListener.connectionCheckedOut(new ConnectionCheckedOutEvent(getId(connection)));
             return connection;
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             throw (RuntimeException) checkOutFailed(e);
         }
     }
@@ -201,7 +201,7 @@ public void getAsync(final SingleResultCallback<InternalConnection> callback) {
         };
         try {
             stateAndGeneration.throwIfClosedOrPaused();
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             eventSendingCallback.onResult(null, e);
             return;
         }
@@ -212,7 +212,7 @@ public void getAsync(final SingleResultCallback<InternalConnection> callback) {
                 PooledConnection connection;
                 try {
                     connection = getPooledConnection(timeout);
-                } catch (RuntimeException e) {
+                } catch (Exception e) {
                     eventSendingCallback.onResult(null, e);
                     return;
                 }
@@ -375,7 +375,7 @@ ConcurrentPool<UsageTrackingInternalConnection> getPool() {
      */
     @VisibleForTesting(otherwise = PRIVATE)
     void doMaintenance() {
-        Predicate<RuntimeException> silentlyComplete = e ->
+        Predicate<Exception> silentlyComplete = e ->
                 e instanceof MongoInterruptedException || e instanceof MongoTimeoutException
                         || e instanceof MongoConnectionPoolClearedException || ConcurrentPool.isPoolClosedException(e);
         try {
@@ -403,7 +403,7 @@ void doMaintenance() {
                     }
                 });
             }
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             if (!silentlyComplete.test(e)) {
                 LOGGER.warn("Exception thrown during connection pool background maintenance task", e);
                 throw e;
@@ -532,7 +532,7 @@ public void open() {
             try {
                 connectionCreated(connectionPoolListener, wrapped.getDescription().getConnectionId());
                 wrapped.open();
-            } catch (RuntimeException e) {
+            } catch (Exception e) {
                 closeAndHandleOpenFailure();
                 throw new MongoOpenConnectionInternalException(e);
             }
@@ -898,7 +898,7 @@ private PooledConnection openWithConcurrencyLimit(final PooledConnection connect
             try {//phase one
                 availableConnection = acquirePermitOrGetAvailableOpenedConnection(
                         mode == OpenWithConcurrencyLimitMode.TRY_GET_AVAILABLE, timeout);
-            } catch (RuntimeException e) {
+            } catch (Exception e) {
                 connection.closeSilently();
                 throw e;
             }
@@ -938,7 +938,7 @@ void openAsyncWithConcurrencyLimit(
             PooledConnection availableConnection;
             try {//phase one
                 availableConnection = acquirePermitOrGetAvailableOpenedConnection(true, timeout);
-            } catch (RuntimeException e) {
+            } catch (Exception e) {
                 connection.closeSilently();
                 callback.onResult(null, e);
                 return;
@@ -1300,21 +1300,19 @@ public void close() {
         }
 
         private void workerRun() {
-            try {
-                while (state != State.CLOSED) {
-                    try {
-                        Task task = tasks.take();
-                        if (task.timeout().expired()) {
-                            task.failAsTimedOut();
-                        } else {
-                            task.execute();
-                        }
-                    } catch (RuntimeException e) {
-                        LOGGER.error(null, e);
+            while (state != State.CLOSED) {
+                try {
+                    Task task = tasks.take();
+                    if (task.timeout().expired()) {
+                        task.failAsTimedOut();
+                    } else {
+                        task.execute();
                     }
+                } catch (InterruptedException closed) {
+                    // fail the rest of the tasks and stop
+                } catch (Exception e) {
+                    LOGGER.error(null, e);
                 }
-            } catch (InterruptedException closed) {
-                // fail the rest of the tasks and stop
             }
             failAllTasksAfterClosing();
         }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitor.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitor.java
@@ -88,7 +88,7 @@ public void run() {
                         try {
                             dnsSrvRecordInitializer.initialize(unmodifiableSet(hosts));
                             currentHosts = hosts;
-                        } catch (RuntimeException e) {
+                        } catch (Exception e) {
                             LOGGER.warn("Exception in monitor thread during notification of DNS resolution state change", e);
                         }
                     }
@@ -97,7 +97,7 @@ public void run() {
                         dnsSrvRecordInitializer.initialize(e);
                     }
                     LOGGER.info("Exception while resolving SRV records", e);
-                } catch (RuntimeException e) {
+                } catch (Exception e) {
                     if (currentHosts.isEmpty()) {
                         dnsSrvRecordInitializer.initialize(new MongoInternalException("Unexpected runtime exception", e));
                     }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultServerMonitor.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultServerMonitor.java
@@ -230,7 +230,7 @@ private ServerDescription lookupServerDescription(final ServerDescription curren
                                     elapsedTimeNanos, currentServerDescription.getTopologyVersion() != null));
 
                     return createServerDescription(serverId.getAddress(), helloResult, averageRoundTripTime.getAverage());
-                } catch (RuntimeException e) {
+                } catch (Exception e) {
                     serverMonitorListener.serverHeartbeatFailed(
                             new ServerHeartbeatFailedEvent(connection.getDescription().getConnectionId(), System.nanoTime() - start,
                                     currentServerDescription.getTopologyVersion() != null, e));
diff --git a/driver-core/src/main/com/mongodb/internal/connection/GetMoreProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/GetMoreProtocol.java
@@ -109,7 +109,7 @@ public QueryResult<T> execute(final InternalConnection connection) {
             }
             LOGGER.debug("Get-more completed");
             return result;
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             if (commandListener != null) {
                 sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), System.nanoTime() - startTimeNanos, e,
                         commandListener, requestContext);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
@@ -327,7 +327,7 @@ public <T> T sendAndReceive(final CommandMessage message, final Decoder<T> decod
             commandEventSender.sendStartedEvent();
             try {
                 sendCommandMessage(message, bsonOutput, sessionContext);
-            } catch (RuntimeException e) {
+            } catch (Exception e) {
                 commandEventSender.sendFailedEvent(e);
                 throw e;
             }
@@ -426,7 +426,7 @@ private <T> T receiveCommandMessageResponse(final Decoder<T> decoder,
             }
 
             return commandResult;
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             if (!commandSuccessful) {
                 commandEventSender.sendFailedEvent(e);
             }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/KillCursorProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/KillCursorProtocol.java
@@ -80,7 +80,7 @@ public Void execute(final InternalConnection connection) {
                                           System.nanoTime() - startTimeNanos, commandListener, requestContext);
             }
             return null;
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             if (commandListener != null && namespace != null) {
                 sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), System.nanoTime() - startTimeNanos, e,
                         commandListener, requestContext);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ProtocolHelper.java b/driver-core/src/main/com/mongodb/internal/connection/ProtocolHelper.java
@@ -227,10 +227,7 @@ static MessageSettings getMessageSettings(final ConnectionDescription connection
     static void encodeMessage(final RequestMessage message, final BsonOutput bsonOutput) {
         try {
             message.encode(bsonOutput, NoOpSessionContext.INSTANCE);
-        } catch (RuntimeException e) {
-            bsonOutput.close();
-            throw e;
-        } catch (Error e) {
+        } catch (Exception | Error e) {
             bsonOutput.close();
             throw e;
         }
@@ -240,10 +237,7 @@ static RequestMessage.EncodingMetadata encodeMessageWithMetadata(final RequestMe
         try {
             message.encode(bsonOutput, NoOpSessionContext.INSTANCE);
             return message.getEncodingMetadata();
-        } catch (RuntimeException e) {
-            bsonOutput.close();
-            throw e;
-        } catch (Error e) {
+        } catch (Exception | Error e) {
             bsonOutput.close();
             throw e;
         }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/QueryProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/QueryProtocol.java
@@ -304,7 +304,7 @@ public QueryResult<T> execute(final InternalConnection connection) {
                 responseBuffers.close();
             }
 
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             if (commandListener != null) {
                 sendCommandFailedEvent(message, FIND_COMMAND_NAME, connection.getDescription(), System.nanoTime() - startTimeNanos, e,
                         commandListener, requestContext);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/WriteProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/WriteProtocol.java
@@ -73,7 +73,7 @@ public WriteConcernResult execute(final InternalConnection connection) {
 
             messageId = requestMessage.getId();
             connection.sendMessage(bsonOutput.getByteBuffers(), messageId);
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             sendFailedEvent(connection, requestMessage, sentCommandStartedEvent, e, startTimeNanos);
             throw e;
         } finally {
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ZstdCompressor.java b/driver-core/src/main/com/mongodb/internal/connection/ZstdCompressor.java
@@ -48,8 +48,8 @@ public void compress(final List<ByteBuf> source, final BsonOutput target) {
             byte[] out = new byte[(int) Zstd.compressBound(uncompressedSize)];
             int compressedSize = (int) Zstd.compress(out, singleByteArraySource, Zstd.maxCompressionLevel());
             target.writeBytes(out, 0, compressedSize);
-        } catch (RuntimeException e) {
-            throw new MongoInternalException("Unexpected RuntimeException", e);
+        } catch (Exception e) {
+            throw new MongoInternalException("Unexpected exception", e);
         }
     }
 
diff --git a/driver-core/src/main/com/mongodb/internal/event/ConnectionPoolListenerMulticaster.java b/driver-core/src/main/com/mongodb/internal/event/ConnectionPoolListenerMulticaster.java
@@ -92,7 +92,7 @@ public void connectionPoolReady(final ConnectionPoolReadyEvent event) {
         for (ConnectionPoolListener cur : connectionPoolListeners) {
             try {
                 cur.connectionPoolReady(event);
-            } catch (RuntimeException e) {
+            } catch (Exception e) {
                 if (LOGGER.isWarnEnabled()) {
                     LOGGER.warn(format("Exception thrown raising connection pool ready event to listener %s", cur), e);
                 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -204,7 +204,7 @@ public void onResult(final List<RawBsonDocument> result, final Throwable t) {
                             cachePostBatchResumeToken(wrappedCursor);
                         }
                         errHandlingCallback.onResult(convertedResults, null);
-                    } catch (RuntimeException e) {
+                    } catch (Exception e) {
                         errHandlingCallback.onResult(null, e);
                     }
                 } else {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
@@ -590,7 +590,7 @@ static <R, T extends ReferenceCounted> R withSuppliedResource(final Supplier<T>
         try {
             try {
                 resource = resourceSupplier.get();
-            } catch (RuntimeException supplierException) {
+            } catch (Exception supplierException) {
                 if (wrapSupplierException) {
                     throw new ResourceSupplierInternalException(supplierException);
                 } else {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/QueryBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/QueryBatchCursor.java
@@ -533,7 +533,7 @@ void executeWithConnection(final Consumer<Connection> action) {
             } catch (MongoSocketException e) {
                 try {
                     onCorruptedConnection(connection);
-                } catch (RuntimeException suppressed) {
+                } catch (Exception suppressed) {
                     e.addSuppressed(suppressed);
                 }
                 throw e;
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/search/AggregatesSearchIntegrationTest.java b/driver-core/src/test/functional/com/mongodb/client/model/search/AggregatesSearchIntegrationTest.java
@@ -257,7 +257,7 @@ void test(
             List<BsonDocument> results;
             try {
                 results = collectionHelpers.get(ns).aggregate(pipeline);
-            } catch (RuntimeException e) {
+            } catch (Exception e) {
                 throw new RuntimeException(msgSupplier.get(), e);
             }
             accessory.resultAsserter.accept(results, msgSupplier);
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/DefaultConnectionPoolTest.java b/driver-core/src/test/functional/com/mongodb/internal/connection/DefaultConnectionPoolTest.java
@@ -293,7 +293,7 @@ void infiniteMaxSize() {
             connections.forEach(connection -> {
                 try {
                     connection.close();
-                } catch (RuntimeException e) {
+                } catch (Exception e) {
                     // ignore
                 }
             });
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/TestInternalConnection.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestInternalConnection.java
@@ -252,7 +252,7 @@ public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequ
         try {
             sendMessage(byteBuffers, lastRequestId);
             callback.onResult(null, null);
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             callback.onResult(null, e);
         }
     }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionTest.java
@@ -297,7 +297,7 @@ public void shouldPassAllOutcomes() {
                         getErrorContainsField(expectedResult), operationName), hasErrorContainsField(expectedResult));
                 assertFalse(String.format("Expected error code '%s' but none thrown for operation %s",
                         getErrorCodeNameField(expectedResult), operationName), hasErrorCodeNameField(expectedResult));
-            } catch (RuntimeException e) {
+            } catch (Exception e) {
                 boolean passedAssertion = false;
                 if (hasErrorContainsField(expectedResult)) {
                     String expectedError = getErrorContainsField(expectedResult);
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractRetryableWritesTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractRetryableWritesTest.java
@@ -144,7 +144,7 @@ public void shouldPassAllOutcomes() {
             BsonDocument result = helper.getOperationResults(operation);
             assertFalse("Expected error but instead got result: " + result.toJson(), isErrorExpected);
             assertEquals(outcome.getDocument("result", new BsonDocument()), result.getDocument("result", new BsonDocument()));
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             if (!isErrorExpected) {
                 throw e;
             }
@@ -157,7 +157,7 @@ public void shouldPassAllOutcomes() {
         }
     }
 
-    private void assertExceptionState(final RuntimeException e, final BsonValue expectedResult, final String operationName) {
+    private void assertExceptionState(final Exception e, final BsonValue expectedResult, final String operationName) {
         if (hasErrorLabelsContainField(expectedResult)) {
             if (e instanceof MongoException) {
                 MongoException mongoException = (MongoException) e;
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractUnifiedTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractUnifiedTest.java
diff --git a/driver-sync/src/test/functional/com/mongodb/client/WithTransactionProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/WithTransactionProseTest.java
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestFailureValidator.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestFailureValidator.java

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ void start() {`
`147`	`147`	`pendingRegistration.attachment);`
`148`	`148`	`iter.remove();`
`149`	`149`	`}`
`150`		`- } catch (IOException \| RuntimeException e) {`
	`150`	`+ } catch (Exception e) {`
`151`	`151`	`LOGGER.warn("Exception in selector loop", e);`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public int release() {`
`149`	`149`	`private void isConnectionSourcePinningRequired(final SingleResultCallback<Boolean> callback) {`
`150`	`150`	`try {`
`151`	`151`	`callback.onResult(isConnectionSourcePinningRequired(), null);`
`152`		`- } catch (RuntimeException e) {`
	`152`	`+ } catch (Exception e) {`
`153`	`153`	`callback.onResult(null, e);`
`154`	`154`	`}`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ public void breakAndThrowIfRetryAnd(final Supplier<Boolean> predicate) throws Ru`
`248`	`248`	`if (predicate.get()) {`
`249`	`249`	`loopState.markAsLastIteration();`
`250`	`250`	`}`
`251`		`- } catch (RuntimeException predicateException) {`
	`251`	`+ } catch (Exception predicateException) {`
`252`	`252`	`predicateException.addSuppressed(localException);`
`253`	`253`	`throw predicateException;`
`254`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,9 @@ public R get() {`
`65`	`65`	`return syncFunction.get();`
`66`	`66`	`} catch (RuntimeException attemptException) {`
`67`	`67`	`state.advanceOrThrow(attemptException, failedResultTransformer, retryPredicate);`
	`68`	`+ } catch (Exception attemptException) {`
	`69`	`+ // wrap potential sneaky / Kotlin exceptions`
	`70`	`+ state.advanceOrThrow(new RuntimeException(attemptException), failedResultTransformer, retryPredicate);`
`68`	`71`	`}`
`69`	`72`	`}`
`70`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ private void publishEvents() {`
`169`	`169`	`if (isLastEvent) {`
`170`	`170`	`break;`
`171`	`171`	`}`
`172`		`- } catch (RuntimeException \| InterruptedException e) {`
	`172`	`+ } catch (Exception e) {`
`173`	`173`	`// ignore exceptions thrown from listeners, also ignore interrupts that user code may cause`
`174`	`174`	`}`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ private T createNewAndReleasePermitIfFailure() {`
`219`	`219`	`throw new MongoInternalException("The factory for the pool created a null item");`
`220`	`220`	`}`
`221`	`221`	`return newMember;`
`222`		`- } catch (RuntimeException e) {`
	`222`	`+ } catch (Exception e) {`
`223`	`223`	`stateAndPermits.releasePermit();`
`224`	`224`	`throw e;`
`225`	`225`	`}`
`@@ -277,7 +277,7 @@ public String toString() {`
`277`	`277`	`private void close(final T t) {`
`278`	`278`	`try {`
`279`	`279`	`itemFactory.close(t);`
`280`		`- } catch (RuntimeException e) {`
	`280`	`+ } catch (Exception e) {`
`281`	`281`	`// ItemFactory.close() really should not throw`
`282`	`282`	`}`
`283`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public void run() {`
`88`	`88`	`try {`
`89`	`89`	`dnsSrvRecordInitializer.initialize(unmodifiableSet(hosts));`
`90`	`90`	`currentHosts = hosts;`
`91`		`- } catch (RuntimeException e) {`
	`91`	`+ } catch (Exception e) {`
`92`	`92`	`LOGGER.warn("Exception in monitor thread during notification of DNS resolution state change", e);`
`93`	`93`	`}`
`94`	`94`	`}`
`@@ -97,7 +97,7 @@ public void run() {`
`97`	`97`	`dnsSrvRecordInitializer.initialize(e);`
`98`	`98`	`}`
`99`	`99`	`LOGGER.info("Exception while resolving SRV records", e);`
`100`		`- } catch (RuntimeException e) {`
	`100`	`+ } catch (Exception e) {`
`101`	`101`	`if (currentHosts.isEmpty()) {`
`102`	`102`	`dnsSrvRecordInitializer.initialize(new MongoInternalException("Unexpected runtime exception", e));`
`103`	`103`	`}`