Updated targeting assertion handling

- Use trace assert feature
- Move assertions out of 'if' checks

Change-Id: I185d8d22fbdb81e62b09f13055e08d1de8d487e2
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/235
Tested-by: Jenkins Server
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 12 insertions, 3 deletions

diff --git a/src/include/usr/targeting/target.H b/src/include/usr/targeting/target.H
index f2764aca8..76e508e27 100644
--- a/src/include/usr/targeting/target.H
+++ b/src/include/usr/targeting/target.H
@@ -171,7 +171,10 @@ class Target
             typename AttributeTraits<A>::Type const& i_attrValue)
         {
             bool l_wrote = trySetAttr<A>(i_attrValue);
-            assert(l_wrote);
+            
+            //@TODO: Remove assert once release has stabilized
+            assert(l_wrote,"TARGETING::Target::setAttr<%d>: trySetAttr "
+                   "returned false",A);
         }
 
     private: // Private helper interfaces
@@ -282,7 +285,10 @@ typename AttributeTraits<A>::Type Target::getAttr() const
 {
     typename AttributeTraits<A>::Type l_attrValue;
     bool l_read = tryGetAttr<A>(l_attrValue);
-    assert(l_read);
+    
+    //@TODO Remove assert once release has stablized 
+    assert(l_read,"TARGETING::Target::getAttr<%d>: tryGetAttr "
+           "returned false",A);
     return l_attrValue;
 }
 
@@ -295,7 +301,10 @@ const char* Target::getAttrAsString() const
     if(AttributeTraits<A>::hasStringConversion) { }
     typename AttributeTraits<A>::Type l_attrValue;
     bool l_read = tryGetAttr<A>(l_attrValue);
-    assert(l_read);
+
+    //@TODO Remove assert once release has stabilized
+    assert(l_read,"TARGETING::Target::getAttrAsString<%d>: tryGetAttr "
+           "returned false",A);
     return attrToString<A>(l_attrValue);
 }