Skip to content

Commit 76aacdc

Browse files
[plugins] Remove ConnectionID from applicable SmartInterfaceTypes (#1895)
(breaking) Co-authored-by: Pierre Wielders <[email protected]>
1 parent c61db0e commit 76aacdc

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

Source/plugins/Types.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ namespace RPC {
287287
: _controller(nullptr)
288288
, _administrator(channelWaitTime)
289289
, _monitor(*this)
290-
, _connectionId(~0)
291290
{
292291
}
293292
POP_WARNING()
@@ -297,10 +296,6 @@ POP_WARNING()
297296
}
298297

299298
public:
300-
DEPRECATED uint32_t ConnectionId() const
301-
{
302-
return (_connectionId);
303-
}
304299
bool IsOperational() const
305300
{
306301
return (_monitor.IsOperational());
@@ -321,10 +316,6 @@ POP_WARNING()
321316
}
322317
if (_controller != nullptr) {
323318
_monitor.Register(_controller, callsign);
324-
Core::ProxyType<CommunicatorClient> channel(_administrator.Communicator(node));
325-
if (channel.IsValid() == true) {
326-
_connectionId = channel->ConnectionId();
327-
}
328319
}
329320

330321
return (_controller != nullptr ? Core::ERROR_NONE : Core::ERROR_UNAVAILABLE);
@@ -400,7 +391,6 @@ POP_WARNING()
400391
PluginHost::IShell* _controller;
401392
ConnectorType<ENGINE> _administrator;
402393
Monitor _monitor;
403-
uint32_t _connectionId;
404394
};
405395

406396
/*
@@ -565,7 +555,6 @@ POP_WARNING()
565555
explicit SmartControllerInterfaceType(const uint32_t channelWaitTime = Core::infinite)
566556
: _controller(nullptr)
567557
, _administrator(channelWaitTime)
568-
, _connectionId(~0)
569558
{
570559
}
571560

@@ -575,10 +564,6 @@ POP_WARNING()
575564
}
576565

577566
public:
578-
DEPRECATED uint32_t ConnectionId() const
579-
{
580-
return (_connectionId);
581-
}
582567
bool IsOperational() const
583568
{
584569
return (_controller != nullptr);
@@ -597,12 +582,6 @@ POP_WARNING()
597582
if (_controller == nullptr) {
598583
_controller = _administrator.template Acquire<PluginHost::IShell>(waitTime, node, _T(""), ~0);
599584
}
600-
if (_controller != nullptr) {
601-
Core::ProxyType<CommunicatorClient> channel(_administrator.Communicator(node));
602-
if (channel.IsValid() == true) {
603-
_connectionId = channel->ConnectionId();
604-
}
605-
}
606585

607586
return (_controller != nullptr ? Core::ERROR_NONE : Core::ERROR_UNAVAILABLE);
608587
}
@@ -651,7 +630,6 @@ POP_WARNING()
651630
private:
652631
PluginHost::IShell* _controller;
653632
ConnectorType<ENGINE> _administrator;
654-
uint32_t _connectionId;
655633
};
656634

657635
}

0 commit comments

Comments
 (0)