Merge branch '336-inc-flush-attr' into dev

src/template/incremental/Notification.tt

@@ -224,6 +224,7 @@ if (#(signature)_values != null && #(signature)_values.containsKey(fParams)) {
   $DDGNodeName handler = ($DDGNodeName) #(signature)_handler.remove(fParams);
   handler.throwAway();
   handler.notifyDependencies();
+  $include(AttrDecl.traceFlushIncAttr)
 }
 $else
 $if(#isCircular)
@@ -245,6 +246,7 @@ if (#(signature)_values != null && !#(signature)_values.isEmpty()) {
   #resetVisit
   #resetCache
   #(signature)_handler.notifyDependencies();
+  $include(AttrDecl.traceFlushIncAttr)
 }
 $else
 $if(#isCircular)
@@ -255,6 +257,7 @@ $endif
   #resetVisit
   #resetCache
   #(signature)_handler.notifyDependencies();
+  $include(AttrDecl.traceFlushIncAttr)
 }
 $endif
 $endif

src/template/trace/TraceHooks.tt

@@ -385,8 +385,12 @@ $endif
 
 AttrDecl.traceFlushIncAttr [[
 $if (TraceFlush)
+$if (#isParameterized)
+state.trace().flushIncAttr("#getAspectName", fNode, fAttrID, fParams, "");
+$else
 state.trace().flushIncAttr("#getAspectName", fNode, fAttrID, "", "");
 $endif
+$endif
 ]]
 
 CollEq.traceContributionCheckBegin [[