[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - net/Socket.hpp net/SslSocket.hpp

[Ashod Nakashian]

 net/Socket.hpp    |    2 +-
 net/SslSocket.hpp |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5263e9d01042c2457f423b3240f1ac87105b58ce
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Apr 9 16:33:28 2017 -0400

    wsd: don't call virtuals in dtors
    
    Change-Id: I2490e2f63dc20cf6b3fa0be45341b041e3ccb1bf
    Reviewed-on: https://gerrit.libreoffice.org/36321
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 2ad3cd4de169625f89911953f7311f157b6ee26d)
    Reviewed-on: https://gerrit.libreoffice.org/36332
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 74caa5aa..38a2af85 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -643,7 +643,7 @@ public:
         if (!_shutdownSignalled)
         {
             _shutdownSignalled = true;
-            closeConnection();
+            StreamSocket::closeConnection();
         }
     }
 
diff --git a/net/SslSocket.hpp b/net/SslSocket.hpp
index 2e495883..4b5d1323 100644
--- a/net/SslSocket.hpp
+++ b/net/SslSocket.hpp
@@ -16,7 +16,7 @@
 #include "Socket.hpp"
 
 /// An SSL/TSL, non-blocking, data streaming socket.
-class SslStreamSocket : public StreamSocket
+class SslStreamSocket final : public StreamSocket
 {
 public:
     SslStreamSocket(const int fd, std::shared_ptr<SocketHandlerInterface> responseClient) :
@@ -55,7 +55,7 @@ public:
         if (!_shutdownSignalled)
         {
             _shutdownSignalled = true;
-            closeConnection();
+            SslStreamSocket::closeConnection();
         }
 
         SSL_free(_ssl);