Remove redundant Socket::isClosed()

Signed-off-by: Sven Göthel <[email protected]> Change-Id: Iad74f253bdac5636757b130b299b5deacda658db
CollaboraOnline · Nov 1, 2024 · b5cd651 · b5cd651
1 parent 8ced25f
commit b5cd651
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
@@ -193,7 +193,7 @@ class WebSocketHandler : public ProtocolHandlerInterface
             return;
         }
 
-        if (socket->isClosed())
+        if (!socket->isOpen())
         {
             LOG_DBG("Socket is closed. Cannot send Close Frame");
             return;
@@ -261,7 +261,7 @@ class WebSocketHandler : public ProtocolHandlerInterface
     bool isConnected() const
     {
         std::shared_ptr<StreamSocket> socket = _socket.lock();
-        return socket && !socket->isClosed();
+        return socket && socket->isOpen();
     }
 
 private:
@@ -823,7 +823,7 @@ class WebSocketHandler : public ProtocolHandlerInterface
             return -1;
         }
 
-        if (socket->isClosed())
+        if (!socket->isOpen())
         {
             LOG_DBG("Socket is closed. Cannot send WS frame");
             return 0;

diff --git a/wsd/ClientRequestDispatcher.cpp b/wsd/ClientRequestDispatcher.cpp
@@ -956,7 +956,7 @@ void ClientRequestDispatcher::handleIncomingMessage(SocketDisposition& dispositi
             socket->eraseFirstInputBytes(map._messageSize - map._headerSize);
         }
     }
-    if( servedSync && closeConnection && !socket->isClosed() )
+    if( servedSync && closeConnection && socket->isOpen() )
     {
         LOG_DBG("Handled request: " << request.getURI()
                 << ", inBuf[sz " << preInBufferSz << " -> " << socket->getInBuffer().size()
@@ -969,7 +969,7 @@ void ClientRequestDispatcher::handleIncomingMessage(SocketDisposition& dispositi
         LOG_DBG("Handled request: " << request.getURI()
                 << ", inBuf[sz " << preInBufferSz << " -> " << socket->getInBuffer().size()
                 << ", rm " <<  (preInBufferSz-socket->getInBuffer().size())
-                << "], connection open " << !socket->isClosed());
+                << "], connection open " << socket->isOpen());
 
 #else // !MOBILEAPP
     Poco::Net::HTTPRequest request;