Fixing the fix (envoyproxy#4333)

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
rshriram · Sep 4, 2018 · 752483e · 752483e
1 parent 83487f6
commit 752483e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/source/common/network/connection_impl.cc b/source/common/network/connection_impl.cc
@@ -68,7 +68,7 @@ ConnectionImpl::ConnectionImpl(Event::Dispatcher& dispatcher, ConnectionSocketPt
 }
 
 ConnectionImpl::~ConnectionImpl() {
-  ASSERT(fd() == -1);
+  ASSERT(fd() == -1, "ConnectionImpl was unexpectedly torn down without being closed.");
 
   // In general we assume that owning code has called close() previously to the destructor being
   // run. This generally must be done so that callbacks run in the correct context (vs. deferred

diff --git a/test/integration/echo_integration_test.cc b/test/integration/echo_integration_test.cc
@@ -134,6 +134,8 @@ TEST_P(EchoIntegrationTest, AddRemoveListener) {
     if (connection2.connection().state() == Network::Connection::State::Closed) {
       connect_fail = true;
       break;
+    } else {
+      connection2.close();
     }
   }
   ASSERT_TRUE(connect_fail);