More review fixes

zeroc-ice · Apr 12, 2024 · c4e8206 · c4e8206
1 parent a9aafe4
commit c4e8206
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
@@ -2097,7 +2097,7 @@ Ice::ConnectionI::ConnectionI(
     const TransceiverPtr& transceiver,
     const ConnectorPtr& connector,
     const EndpointIPtr& endpoint,
-    const shared_ptr<ObjectAdapterI>& adapter)
+    const shared_ptr<ObjectAdapterI>& adapter) noexcept
     : _communicator(communicator),
       _instance(instance),
       _monitor(monitor),
@@ -2608,7 +2608,7 @@ Ice::ConnectionI::sendHeartbeatNow()
             OutgoingMessage message(&os, false);
             sendMessage(message);
         }
-        catch (...)
+        catch (const LocalException&)
         {
             setState(StateClosed, current_exception());
             assert(_exception);

diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
@@ -238,7 +238,7 @@ namespace Ice
             const IceInternal::TransceiverPtr&,
             const IceInternal::ConnectorPtr&,
             const IceInternal::EndpointIPtr&,
-            const std::shared_ptr<ObjectAdapterI>&);
+            const std::shared_ptr<ObjectAdapterI>&) noexcept;
 
         static ConnectionIPtr create(
             const Ice::CommunicatorPtr&,

diff --git a/cpp/src/Ice/IdleTimeoutTransceiverDecorator.cpp b/cpp/src/Ice/IdleTimeoutTransceiverDecorator.cpp
@@ -86,12 +86,10 @@ IdleTimeoutTransceiverDecorator::initialize(Buffer& readBuffer, Buffer& writeBuf
 
 IdleTimeoutTransceiverDecorator::~IdleTimeoutTransceiverDecorator()
 {
-    // If we destroy this object before calling decoratorInit(), _heartbeatTimerTask and _idleCheckTimerTask will be
-    // null.
-    if (_heartbeatTimerTask)
-    {
-        _timer->cancel(_heartbeatTimerTask);
-    }
+    // Since ConnectionI is noexcept, decoratorInit always sets _heartbeatTimerTask.
+    assert(_heartbeatTimerTask);
+    _timer->cancel(_heartbeatTimerTask);
+
     if (_idleCheckTimerTask)
     {
         _timer->cancel(_idleCheckTimerTask);

diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
@@ -472,14 +472,9 @@ IceInternal::UdpTransceiver::finishRead(Buffer& buf)
 bool
 IceInternal::UdpTransceiver::isWaitingToBeRead() const noexcept
 {
-    if (_incoming)
-    {
-        return hasBytesAvailable(_fd);
-    }
-    else
-    {
-        return false;
-    }
+    // isWaitingToBeRead is used only by the idle check, and the idle check is not used for UDP.
+    assert(false);
+    return false;
 }
 
 string