From 47c3953fae2c026042fc62e9ab8432c1d530401c Mon Sep 17 00:00:00 2001
From: Ananth Suryanarayana <anantha@juniper.net>
Date: Wed, 19 Oct 2016 11:20:22 -0700
Subject: [PATCH] Revert part of commit
 a13ca9305c331064352b11c8207001c4c8a3f35e

async_read_some() with null_buffers on ssl_socket has resulted in
high CPU usage due to read callbacks even when there is no data to
read..

This needs further investigation. Hence this has been reverted.

Change-Id: I6f7311fcad19f268c5c4147e91d76dc5618fd075
Partiail-Bug: 1608731
---
 src/io/ssl_session.cc          | 2 +-
 src/io/test/ssl_server_test.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/io/ssl_session.cc b/src/io/ssl_session.cc
index d8ea811017f..d0e34ffff9a 100644
--- a/src/io/ssl_session.cc
+++ b/src/io/ssl_session.cc
@@ -98,7 +98,7 @@ void SslSession::AsyncReadSome() {
     }
 
     if (established()) {
-        ssl_socket_->async_read_some(null_buffers(),
+        socket()->async_read_some(null_buffers(),
             bind(&TcpSession::AsyncReadHandler, TcpSessionPtr(this)));
     }
 }
diff --git a/src/io/test/ssl_server_test.cc b/src/io/test/ssl_server_test.cc
index 6b69d52095b..351ad192fda 100644
--- a/src/io/test/ssl_server_test.cc
+++ b/src/io/test/ssl_server_test.cc
@@ -389,7 +389,7 @@ TEST_F(SslEchoServerTest, msg_send_recv) {
     client = NULL;
 }
 
-TEST_F(SslEchoServerTest, large_msg_send_recv) {
+TEST_F(SslEchoServerTest, DISABLED_large_msg_send_recv) {
 
     SetUpImmedidate();
     SslClient *client = new SslClient(evm_.get(), false, true);