From f955cd5a0ec8d94dc16fb441d74f78b95269c1e8 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@harvey>
Date: Fri, 20 Mar 2020 17:15:28 +0100
Subject: [PATCH] FIX: /Info does not fail anymore.
See #83
---
.../caosdb/server/database/misc/TransactionBenchmark.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/caosdb/server/database/misc/TransactionBenchmark.java b/src/main/java/caosdb/server/database/misc/TransactionBenchmark.java
index 91bf0acb..5738318e 100644
--- a/src/main/java/caosdb/server/database/misc/TransactionBenchmark.java
+++ b/src/main/java/caosdb/server/database/misc/TransactionBenchmark.java
@@ -236,7 +236,11 @@ class JdomConverter {
Element ret = new Element(b.getName());
ret.setAttribute("since", new Date(b.since).toString());
ret.setAttribute("since_ms", Long.toString(b.since));
- ret.setAttribute("called_from", b.called_from());
+ String calledFrom = b.called_from();
+ if (null == calledFrom) {
+ calledFrom = "-";
+ }
+ ret.setAttribute("called_from", calledFrom);
Iterable<Measurement> measurements = b.getMeasurements();
synchronized (measurements) {
--
GitLab