mostly code cleanup

src/pvaClientNTMultiData.cpp

@@ -23,9 +23,6 @@ using namespace std;
 
 namespace epics { namespace pvaClient { 
 
-static PVDataCreatePtr pvDataCreate = getPVDataCreate();
-
-
 PvaClientNTMultiDataPtr PvaClientNTMultiData::create(
     epics::pvData::UnionConstPtr const & u,
     PvaClientMultiChannelPtr const &pvaMultiChannel,
@@ -45,8 +42,7 @@ PvaClientNTMultiData::PvaClientNTMultiData(
   pvaClientChannelArray(pvaClientChannelArray),
   nchannel(pvaClientChannelArray.size()),
   gotAlarm(false),
-  gotTimeStamp(false),
-  isDestroyed(false)
+  gotTimeStamp(false)
 {
     if(PvaClient::getDebug()) cout<< "PvaClientNTMultiData::PvaClientNTMultiData()\n";
     PVFieldPtr pvValue = pvRequest->getSubField("field.value");
@@ -55,6 +51,7 @@ PvaClientNTMultiData::PvaClientNTMultiData(
     }
     topPVStructure.resize(nchannel);
     unionValue.resize(nchannel);
+    PVDataCreatePtr pvDataCreate = getPVDataCreate();
     for(size_t i=0; i< nchannel; ++i) {
          topPVStructure[i] = PVStructurePtr();
          unionValue[i] = pvDataCreate->createPVUnion(u);
@@ -90,12 +87,6 @@ PvaClientNTMultiData::PvaClientNTMultiData(
 PvaClientNTMultiData::~PvaClientNTMultiData()
 {
     if(PvaClient::getDebug()) cout<< "PvaClientNTMultiData::~PvaClientNTMultiData()\n";
-    {
-        Lock xx(mutex);
-        if(isDestroyed) throw std::runtime_error("pvaClientNTMultiData was destroyed");
-        isDestroyed = true;
-    }
-    pvaClientChannelArray.clear();
 }
 
 
@@ -180,7 +171,7 @@ TimeStamp PvaClientNTMultiData::getTimeStamp()
 
 NTMultiChannelPtr PvaClientNTMultiData::getNTMultiChannel()
 {
-    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(ntMultiChannelStructure);
+    PVStructurePtr pvStructure = getPVDataCreate()->createPVStructure(ntMultiChannelStructure);
     NTMultiChannelPtr ntMultiChannel = NTMultiChannel::wrap(pvStructure);
     ntMultiChannel->getChannelName()->replace(pvaClientMultiChannel->getChannelNames());
     shared_vector<epics::pvData::PVUnionPtr> val(nchannel);