summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rpc/rpc-lib/src/rpc-clnt.c7
-rw-r--r--rpc/rpc-lib/src/rpc-transport.c3
2 files changed, 7 insertions, 3 deletions
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index eab7551f0..f25a4b0ad 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -1546,8 +1546,11 @@ rpc_clnt_destroy (struct rpc_clnt *rpc)
if (!rpc)
return;
- if (rpc->conn.trans)
- rpc_transport_destroy (rpc->conn.trans);
+ if (rpc->conn.trans) {
+ rpc->conn.trans->mydata = NULL;
+ rpc_transport_unref (rpc->conn.trans);
+ //rpc_transport_destroy (rpc->conn.trans);
+ }
rpc_clnt_connection_cleanup (&rpc->conn);
rpc_clnt_reconnect_cleanup (&rpc->conn);
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index bf0e4dfd6..249c9398f 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -1124,7 +1124,8 @@ rpc_transport_unref (rpc_transport_t *this)
pthread_mutex_unlock (&this->lock);
if (refcount == 0) {
- this->notify (this, this->mydata, RPC_TRANSPORT_CLEANUP, NULL);
+ if (this->mydata)
+ this->notify (this, this->mydata, RPC_TRANSPORT_CLEANUP, NULL);
rpc_transport_destroy (this);
}