You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2019/08/20 22:20:43 UTC
[geode] 04/21: Revert "GEODE-6389 CI Failure:
ConcurrentWANPropagation_1_DUnitTest.testReplicatedSerialPropagation"
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch release/1.9.1
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 8bab401d91720cf0e4b2412d307611fd6a476672
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Thu Jun 27 14:35:11 2019 -0700
Revert "GEODE-6389 CI Failure: ConcurrentWANPropagation_1_DUnitTest.testReplicatedSerialPropagation"
This reverts commit dd6cde77787b7922f16c6b42a0b6ce9ce874b025.
---
.../src/main/java/org/apache/geode/internal/net/SocketCloser.java | 2 +-
.../src/main/java/org/apache/geode/internal/tcp/Connection.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java
index f083d50..cfa3991 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java
@@ -169,7 +169,7 @@ public class SocketCloser {
*
* @param socket the socket to close
* @param address identifies who the socket is connected to
- * @param extra an optional Runnable with stuff to execute before the socket is closed
+ * @param extra an optional Runnable with stuff to execute in the async thread
*/
public void asyncClose(final Socket socket, final String address, final Runnable extra) {
if (socket == null || socket.isClosed()) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 7fcbee5..247819a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -1585,6 +1585,10 @@ public class Connection implements Runnable {
}
asyncClose(false);
this.owner.removeAndCloseThreadOwnedSockets();
+
+ if (this.isSharedResource()) {
+ releaseInputBuffer();
+ }
}
// make sure that if the reader thread exits we notify a thread waiting
// for the handshake.