make more compatible with pvDatabaseJava; work on on-line delete and also termination

2016-07-01 10:27:04 -04:00
parent 75849c6676
commit 0784cc15d0
12 changed files with 89 additions and 123 deletions
--- a/src/pvAccess/monitorFactory.cpp
+++ b/src/pvAccess/monitorFactory.cpp
@@ -109,6 +109,7 @@ MonitorLocal::~MonitorLocal()
    {
        cout << "MonitorLocal::~MonitorLocal()" << endl;
    }
+    destroy();
 }

 void MonitorLocal::destroy()
@@ -121,16 +122,11 @@ void MonitorLocal::destroy()
        Lock xx(mutex);
        if(state==destroyed) return;
    }
-    if(pvCopy) pvCopy->destroy();
+    if(state==active) stop();
    {
        Lock xx(mutex);
        state = destroyed;
    }
-    {
-         Lock xx(queueMutex);
-         queue.reset();
-    }
-    pvCopy.reset();
 }

 Status MonitorLocal::start()