[Libreoffice-commits] online.git: loolwsd/LOOLSession.hpp loolwsd/PrisonerSession.cpp

[Ashod Nakashian]

 loolwsd/LOOLSession.hpp     |    4 ++--
 loolwsd/PrisonerSession.cpp |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e7078ef49b9007866b2b60b23fb2bd859a9fcb68
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun May 29 12:03:26 2016 -0400

    loolwsd: keep private things private
    
    Reviewed-on: https://gerrit.libreoffice.org/25619
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 95b4807e05d0edd8caaa191b2230e363f15523bb)
    
    Change-Id: I8fff570c9033bdc5694cec5a7056e9efc9de967a
    Reviewed-on: https://gerrit.libreoffice.org/25624
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index 35c4690..5746d38 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -114,8 +114,7 @@ protected:
         return peer->sendBinaryFrame(buffer, length);
     }
 
-    // Fields common to sessions in master and jailed processes:
-
+private:
     // Our kind signifies to what we are connected to.
     const Kind _kind;
 
@@ -126,6 +125,7 @@ protected:
     // jailed process, the websocket to the parent.
     std::shared_ptr<Poco::Net::WebSocket> _ws;
 
+protected:
     // The actual URL, also in the child, even if the child never accesses that.
     std::string _docURL;
 
diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp
index 487fb7f..75ba2cf 100644
--- a/loolwsd/PrisonerSession.cpp
+++ b/loolwsd/PrisonerSession.cpp
@@ -257,6 +257,7 @@ bool PrisonerSession::shutdownPeer(Poco::UInt16 statusCode, const std::string& m
     {
         peer->shutdown(statusCode, message);
     }
+
     return peer != nullptr;
 }