From f1cc0ef286dc50130f71e4de140d3a8b543c00a7 Mon Sep 17 00:00:00 2001
From: Jan Waller <jwa@informatik.uni-kiel.de>
Date: Thu, 12 Jun 2014 12:53:55 +0200
Subject: [PATCH] fix for meta-monitoring

---
 .../MonitoredClassManualInstrumentation.java         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frameworks/Kieker/src/mooBench/monitoredApplication/MonitoredClassManualInstrumentation.java b/frameworks/Kieker/src/mooBench/monitoredApplication/MonitoredClassManualInstrumentation.java
index 1b56258..db63123 100644
--- a/frameworks/Kieker/src/mooBench/monitoredApplication/MonitoredClassManualInstrumentation.java
+++ b/frameworks/Kieker/src/mooBench/monitoredApplication/MonitoredClassManualInstrumentation.java
@@ -87,11 +87,13 @@ public final class MonitoredClassManualInstrumentation implements MonitoredClass
 
 	private final static void triggerAfter(final boolean newTrace) {
 		final TraceMetadata trace = TRACEREGISTRY.getTrace();
-		final String signature = SIGNATURE;
-		final String clazz = CLAZZ;
-		CTRLINST.newMonitoringRecord(new AfterOperationEvent(TIME.getTime(), trace.getTraceId(), trace.getNextOrderId(), signature, clazz));
-		if (newTrace) { // close the trace
-			TRACEREGISTRY.unregisterTrace();
+		if (null != trace) {
+			final String signature = SIGNATURE;
+			final String clazz = CLAZZ;
+			CTRLINST.newMonitoringRecord(new AfterOperationEvent(TIME.getTime(), trace.getTraceId(), trace.getNextOrderId(), signature, clazz));
+			if (newTrace) { // close the trace
+				TRACEREGISTRY.unregisterTrace();
+			}
 		}
 	}
 }
-- 
GitLab