From f1aca7e20f8773bd321cf41ab4a032d41942124d Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Tue, 26 Aug 2014 06:30:30 -0400
Subject: [PATCH] fix bug for userTag

---
 src/nt/ntmultiChannel.cpp      |  2 ++
 test/nt/ntmultiChannelTest.cpp | 26 +++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/nt/ntmultiChannel.cpp b/src/nt/ntmultiChannel.cpp
index 2eb7a44..6d80ea3 100644
--- a/src/nt/ntmultiChannel.cpp
+++ b/src/nt/ntmultiChannel.cpp
@@ -177,6 +177,7 @@ void NTMultiChannelBuilder::reset()
     message = false;
     secondsPastEpoch = false;
     nanoseconds = false;
+    userTag = false;
 }
 
 }
@@ -206,6 +207,7 @@ NTMultiChannel::NTMultiChannel(PVStructurePtr const & pvStructure)
   pvMessage(pvStructure->getSubField<PVStringArray>("message")),
   pvSecondsPastEpoch(pvStructure->getSubField<PVLongArray>("secondsPastEpoch")),
   pvNanoseconds(pvStructure->getSubField<PVIntArray>("nanoseconds")),
+  pvUserTag(pvStructure->getSubField<PVIntArray>("userTag")),
   pvDescriptor(pvStructure->getSubField<PVString>("descriptor"))
 {
 }
diff --git a/test/nt/ntmultiChannelTest.cpp b/test/nt/ntmultiChannelTest.cpp
index 55d5339..75e6a90 100644
--- a/test/nt/ntmultiChannelTest.cpp
+++ b/test/nt/ntmultiChannelTest.cpp
@@ -120,12 +120,36 @@ static void test()
     testOk1(multiChannel.get() != 0);
     pvStructure = multiChannel->getPVStructure();
     if(debug) {cout << *pvStructure << endl;}
+    PVStructurePtr pvTimeStamp = multiChannel->getTimeStamp();
+    testOk1(pvTimeStamp.get() !=0);
+    PVStructurePtr pvAlarm = multiChannel->getAlarm();
+    testOk1(pvAlarm.get() !=0);
+    pvValue = multiChannel->getValue();
+    testOk1(pvValue.get() !=0);
+    pvChannelName = multiChannel->getChannelName();
+    testOk1(pvChannelName.get() !=0);
+    pvIsConnected = multiChannel->getIsConnected();
+    testOk1(pvIsConnected.get() !=0);
+    pvSeverity = multiChannel->getSeverity();
+    testOk1(pvSeverity.get() !=0);
+    PVIntArrayPtr pvStatus = multiChannel->getStatus();
+    testOk1(pvStatus.get() !=0);
+    PVStringArrayPtr pvMessage = multiChannel->getMessage();
+    testOk1(pvMessage.get() !=0);
+    PVLongArrayPtr pvSecondsPastEpoch = multiChannel->getSecondsPastEpoch();
+    testOk1(pvSecondsPastEpoch.get() !=0);
+    PVIntArrayPtr pvNanoseconds = multiChannel->getNanoseconds();
+    testOk1(pvNanoseconds.get() !=0);
+    PVIntArrayPtr pvUserTag = multiChannel->getUserTag();
+    testOk1(pvUserTag.get() !=0);
+    PVStringPtr pvDescriptor = multiChannel->getDescriptor();
+    testOk1(pvDescriptor.get() !=0);
 }
 
 
 MAIN(testCreateRequest)
 {
-    testPlan(6);
+    testPlan(18);
     test();
     return testDone();
 }