trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shinr...@apache.org
Subject [trafficserver] branch master updated: TS-4900: con_id member variable is shadowed in Http2ClientSession
Date Wed, 28 Sep 2016 17:38:27 GMT
This is an automated email from the ASF dual-hosted git repository.

shinrich pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  97de9ba   TS-4900: con_id member variable is shadowed in Http2ClientSession
97de9ba is described below

commit 97de9baa7fae6799321b6f1e7213286f73e85c3b
Author: Susan Hinrichs <shinrich@ieee.org>
AuthorDate: Wed Sep 28 01:37:37 2016 +0000

    TS-4900: con_id member variable is shadowed in Http2ClientSession
---
 proxy/http/Http1ClientSession.cc  | 3 +--
 proxy/http/Http1ClientSession.h   | 1 -
 proxy/http2/Http2ClientSession.cc | 3 +--
 proxy/http2/Http2ClientSession.h  | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/proxy/http/Http1ClientSession.cc b/proxy/http/Http1ClientSession.cc
index a4c857f..f87dbb9 100644
--- a/proxy/http/Http1ClientSession.cc
+++ b/proxy/http/Http1ClientSession.cc
@@ -59,8 +59,7 @@ ink_mutex debug_cs_list_mutex;
 ClassAllocator<Http1ClientSession> http1ClientSessionAllocator("http1ClientSessionAllocator");
 
 Http1ClientSession::Http1ClientSession()
-  : con_id(0),
-    client_vc(NULL),
+  : client_vc(NULL),
     magic(HTTP_CS_MAGIC_DEAD),
     transact_count(0),
     tcp_init_cwnd_set(false),
diff --git a/proxy/http/Http1ClientSession.h b/proxy/http/Http1ClientSession.h
index 8e963eb..9de6bb4 100644
--- a/proxy/http/Http1ClientSession.h
+++ b/proxy/http/Http1ClientSession.h
@@ -185,7 +185,6 @@ private:
     HCS_CLOSED,
   };
 
-  int64_t con_id;
   NetVConnection *client_vc;
   int magic;
   int transact_count;
diff --git a/proxy/http2/Http2ClientSession.cc b/proxy/http2/Http2ClientSession.cc
index b890213..fcb1179 100644
--- a/proxy/http2/Http2ClientSession.cc
+++ b/proxy/http2/Http2ClientSession.cc
@@ -59,8 +59,7 @@ send_connection_event(Continuation *cont, int event, void *edata)
 }
 
 Http2ClientSession::Http2ClientSession()
-  : con_id(0),
-    total_write_len(0),
+  : total_write_len(0),
     client_vc(NULL),
     read_buffer(NULL),
     sm_reader(NULL),
diff --git a/proxy/http2/Http2ClientSession.h b/proxy/http2/Http2ClientSession.h
index c4d873b..fe5dd6e 100644
--- a/proxy/http2/Http2ClientSession.h
+++ b/proxy/http2/Http2ClientSession.h
@@ -285,7 +285,6 @@ private:
   // if there are multiple frames ready on the wire
   int state_process_frame_read(int event, VIO *vio, bool inside_frame);
 
-  int64_t con_id;
   int64_t total_write_len;
   SessionHandler session_handler;
   NetVConnection *client_vc;

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Mime
View raw message