diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java b/li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java index fbf7cae25..5a1182202 100644 --- a/li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java +++ b/li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java @@ -163,6 +163,24 @@ public abstract class AbstractService service, ServiceArgument arg, long start, Certificate certificate, ServiceResult serviceResult) { @@ -150,11 +166,8 @@ public class DefaultServiceHandler extends StrolchComponent implements ServiceHa String msg = "User {0}: Service {1} took {2}"; //$NON-NLS-1$ String username = certificate.getUsername(); String svcName = service.getClass().getName(); - String realmName = isNotEmpty(arg.realm) ? - arg.realm : - isNotEmpty(certificate.getRealm()) ? - certificate.getRealm() : - getContainer().getRealmNames().iterator().next(); + + String realmName = getRealmName(arg, certificate); msg = MessageFormat.format(msg, username, svcName, formatNanoDuration(end - start)); diff --git a/li.strolch.service/src/test/java/li/strolch/service/TxTest.java b/li.strolch.service/src/test/java/li/strolch/service/TxTest.java index e4cd8d6e4..a5f245f1b 100644 --- a/li.strolch.service/src/test/java/li/strolch/service/TxTest.java +++ b/li.strolch.service/src/test/java/li/strolch/service/TxTest.java @@ -204,7 +204,7 @@ public class TxTest extends AbstractRealmServiceTest