[cpp-test mac] 19：Extension->4SocketIOTest->Open SocketIO Endpoint crashfix (#19199)

PatriceJiang · web-flow · commit 1a0bddf19cb5 · 2018-11-22T13:10:30.000+08:00
* [cpp-test mac] 19：Extension-&gt;4SocketIOTest-&gt;Open SocketIO Endpoint crash fix

* remove redundant condit
diff --git a/cocos/network/SocketIO.cpp b/cocos/network/SocketIO.cpp
@@ -1039,7 +1039,7 @@ SIOClient::SIOClient(const std::string& path, SIOClientImpl* impl, SocketIO::SIO
     , _socket(impl)
     , _delegate(&delegate)
 {
-
+    CC_SAFE_RETAIN(_socket);
 }
 
 SIOClient::~SIOClient()
@@ -1048,6 +1048,7 @@ SIOClient::~SIOClient()
     {
         _socket->disconnectFromEndpoint(_path);
     }
+    CC_SAFE_RELEASE(_socket);
 }
 
 void SIOClient::onOpen()
@@ -1129,7 +1130,7 @@ void SIOClient::socketClosed()
 
 bool SIOClient::isConnected() const
 {
-    return _socket && _socket->_connected && _connected;
+    return _connected && _socket && _socket->_connected ;
 }
 
 void SIOClient::setConnected(bool connected) 

Original file line number	Diff line number	Diff line change
`@@ -1039,7 +1039,7 @@ SIOClient::SIOClient(const std::string& path, SIOClientImpl* impl, SocketIO::SIO`
`1039`	`1039`	`, _socket(impl)`
`1040`	`1040`	`, _delegate(&delegate)`
`1041`	`1041`	`{`
`1042`		`-`
	`1042`	`+ CC_SAFE_RETAIN(_socket);`
`1043`	`1043`	`}`
`1044`	`1044`
`1045`	`1045`	`SIOClient::~SIOClient()`
`@@ -1048,6 +1048,7 @@ SIOClient::~SIOClient()`
`1048`	`1048`	`{`
`1049`	`1049`	`_socket->disconnectFromEndpoint(_path);`
`1050`	`1050`	`}`
	`1051`	`+ CC_SAFE_RELEASE(_socket);`
`1051`	`1052`	`}`
`1052`	`1053`
`1053`	`1054`	`void SIOClient::onOpen()`
`@@ -1129,7 +1130,7 @@ void SIOClient::socketClosed()`
`1129`	`1130`
`1130`	`1131`	`bool SIOClient::isConnected() const`
`1131`	`1132`	`{`
`1132`		`- return _socket && _socket->_connected && _connected;`
	`1133`	`+ return _connected && _socket && _socket->_connected ;`
`1133`	`1134`	`}`
`1134`	`1135`
`1135`	`1136`	`void SIOClient::setConnected(bool connected)`