merge
This commit is contained in:
@@ -5,9 +5,6 @@ readSize checks if size is in limits of size_t?
|
||||
|
||||
|
||||
|
||||
1. protected void destroy(boolean createRequestFailed) {
|
||||
|
||||
|
||||
|
||||
// should be called without any lock hold
|
||||
// TODO in Java as in C++ ? reportChannelStateChange();
|
||||
|
||||
@@ -3645,7 +3645,10 @@ namespace epics {
|
||||
|
||||
if (m_connectionState == DESTROYED)
|
||||
throw std::runtime_error("Channel destroyed.");
|
||||
return m_transport;
|
||||
else if (m_connectionState == CONNECTED)
|
||||
return m_transport;
|
||||
else
|
||||
return Transport::shared_pointer();
|
||||
}
|
||||
|
||||
virtual Transport::shared_pointer getTransport()
|
||||
|
||||
Reference in New Issue
Block a user