From e0819b86cd7f1c80913e032d051e003a3438c6f0 Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Wed, 24 Aug 2016 17:59:53 +0100
Subject: [PATCH] Conflicts: 	src/lib/plugin/ns/SecureSocket.cpp

---
 src/lib/plugin/ns/SecureSocket.cpp | 10 +++++-----
 src/lib/plugin/ns/SecureSocket.h   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/plugin/ns/SecureSocket.cpp b/src/lib/plugin/ns/SecureSocket.cpp
index 9f4df441..43f29023 100644
--- a/src/lib/plugin/ns/SecureSocket.cpp
+++ b/src/lib/plugin/ns/SecureSocket.cpp
@@ -128,16 +128,16 @@ void
 SecureSocket::secureConnect()
 {
 	setJob(new TSocketMultiplexerMethodJob<SecureSocket>(
-			this, &SecureSocket::serviceConnect,
-			getSocket(), isReadable(), isWritable()));
+					this, &SecureSocket::serviceConnect,
+					getSocket(), isReadable(), isWritable()));
 }
 
 void
 SecureSocket::secureAccept()
 {
 	setJob(new TSocketMultiplexerMethodJob<SecureSocket>(
-			this, &SecureSocket::serviceAccept,
-			getSocket(), isReadable(), isWritable()));
+					this, &SecureSocket::serviceAccept,
+					getSocket(), isReadable(), isWritable()));
 }
 
 TCPSocket::EJobResult
@@ -218,7 +218,7 @@ SecureSocket::doWrite()
 	
 	if (bufferSize == 0) {
 		return kRetry;
-	}		
+	}
 
 	if (isSecureReady()) {
 		status = secureWrite(s_staticBuffer, bufferSize, bytesWrote);
diff --git a/src/lib/plugin/ns/SecureSocket.h b/src/lib/plugin/ns/SecureSocket.h
index 3c2ed55d..1a29cdaa 100644
--- a/src/lib/plugin/ns/SecureSocket.h
+++ b/src/lib/plugin/ns/SecureSocket.h
@@ -46,15 +46,15 @@ public:
 	
 	ISocketMultiplexerJob*
 						newJob();
-	void				secureConnect();
-	void				secureAccept();
-	EJobResult			doRead();
-	EJobResult			doWrite();
 	bool				isFatal() const { return m_fatal; }
 	void				isFatal(bool b) { m_fatal = b; }
 	bool				isSecureReady();
+	void				secureConnect();
+	void				secureAccept();
 	int					secureRead(void* buffer, int size, int& read);
 	int					secureWrite(const void* buffer, int size, int& wrote);
+	EJobResult			doRead();
+	EJobResult			doWrite();
 	void				initSsl(bool server);
 	bool				loadCertificates(String& CertFile);