Make sure postPut is called precisely once and after put in Convert::copyUnion.

2015-02-11 22:17:45 +00:00
parent b13bb9819a
commit fbebce0a49
1 changed files with 6 additions and 2 deletions
--- a/src/factory/Convert.cpp
+++ b/src/factory/Convert.cpp
@@ -472,10 +472,14 @@ void Convert::copyUnion(PVUnionPtr const & from, PVUnionPtr const & to)
            if (toValue.get() == 0 || *toValue->getField() != *fromValue->getField())
            {
                toValue = pvDataCreate->createPVField(fromValue->getField());
+                copy(fromValue, toValue);
                to->set(toValue);
            }
-            copy(fromValue, toValue);
-            to->postPut();
+            else
+            {
+                copy(fromValue, toValue);
+                to->postPut();
+            }
        }
    }
    else