X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=misc%2Fenv%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fmisc%2Fenv%2Fimpl%2FAbsTrans.java;h=5ba74369bebf1344d11699b7d5504242a46c04e8;hp=83a049c13bec7f37acf237cd7835c8ceb34146cd;hb=ff1417ff60baee231a28272f9a16ef2c9c8ea0a2;hpb=a47bd51641efcb84e19d68a6383f0947df826636

diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java
index 83a049c1..5ba74369 100644
--- a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java
+++ b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java
@@ -112,7 +112,6 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore {
     public final void checkpoint(String name, int additionalFlag) {
         TimeTaken tt = newTimeTaken(name,CHECKPOINT|additionalFlag);
         trail.add(tt);
-        tt.done();
     }
 
     @Override
@@ -130,8 +129,13 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore {
             // If first entry is sub, then it's actually the last "end" as well
             // otherwise, check end
             //long end = (first.flag&SUB)==SUB?first.end():trail.get(last).end();
-            long end = trail.get(last).end();
+            long end = 0L;
+            for(int i=last;end==0L && i>=0;--i) {
+            	end= trail.get(i).end();
+            }
             metric.total = (end - first.start) / 1000000f;
+        } else {
+        	metric.total=0L;
         }
         
         if (sb==null) {
@@ -165,6 +169,18 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore {
                 for (int i=0;i<indent;++i) {
                     sb.append("  ");
                 }
+                if((tt.flag & CHECKPOINT)==CHECKPOINT) {
+                	// Checkpoint
+                	sb.append("  ");
+                } else {
+                	float ms=tt.millis();
+                    // Add time values to Metric
+                    for (int i=0;i<flags.length;++i) {
+                        if ((tt.flag & flags[i]) == flags[i]) {
+                        	metric.buckets[i]+=ms;
+                        }
+                    }
+                }
                 tt.output(sb);
                 sb.append('\n');
                 if ((tt.flag&SUB)==SUB) {
@@ -172,11 +188,6 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore {
                     ++indent;
                 }
                 
-                // Add time values to Metric
-                float ms = tt.millis();
-                for (int i=0;i<flags.length;++i) {
-                    if (tt.flag == flags[i]) metric.buckets[i]+=ms;
-                }
             }
         }
         return metric;