diff --git a/ch.eitchnet.utils b/ch.eitchnet.utils index 8861db850..72d470fd2 160000 --- a/ch.eitchnet.utils +++ b/ch.eitchnet.utils @@ -1 +1 @@ -Subproject commit 8861db85091eea43f06ed2a480360ba670d3c30e +Subproject commit 72d470fd26350a7b1c79a0e8da8f29c1b9026e05 diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedOrderMap.java b/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedOrderMap.java index 70d01f661..b057b1944 100644 --- a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedOrderMap.java +++ b/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedOrderMap.java @@ -28,9 +28,11 @@ public class CachedOrderMap extends CachedElementMap implements OrderMap @Override protected void assertIsRefParam(Parameter refP) { - if (!refP.getInterpretation().equals(INTERPRETATION_ORDER_REF)) { - String msg = "{0} is not an Order reference as its interpretation is not {1}"; //$NON-NLS-1$ - throw new StrolchException(MessageFormat.format(msg, refP.getLocator(), INTERPRETATION_ORDER_REF)); + String interpretation = refP.getInterpretation(); + if (!interpretation.equals(INTERPRETATION_ORDER_REF)) { + String msg = "{0} is not an Order reference as its interpretation is not {1} it is {2}"; //$NON-NLS-1$ + throw new StrolchException(MessageFormat.format(msg, refP.getLocator(), INTERPRETATION_ORDER_REF, + interpretation)); } if (refP.getUom().equals(UOM_NONE)) { diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedResourceMap.java b/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedResourceMap.java index 2b4344f37..627e2e7b9 100644 --- a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedResourceMap.java +++ b/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedResourceMap.java @@ -27,9 +27,12 @@ public class CachedResourceMap extends CachedElementMap implements Res @Override protected void assertIsRefParam(Parameter refP) { - if (!refP.getInterpretation().equals(INTERPRETATION_RESOURCE_REF)) { - String msg = MessageFormat.format("{0} is not an Resource reference as its interpretation is not {1}", //$NON-NLS-1$ - refP.getLocator(), INTERPRETATION_RESOURCE_REF); + + String interpretation = refP.getInterpretation(); + if (!interpretation.equals(INTERPRETATION_RESOURCE_REF)) { + String msg = MessageFormat.format( + "{0} is not an Resource reference as its interpretation is not {1} it is {2}", //$NON-NLS-1$ + refP.getLocator(), INTERPRETATION_RESOURCE_REF, interpretation); throw new StrolchException(msg); } diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalOrderMap.java b/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalOrderMap.java index 6ae11a0e0..b8a429c0e 100644 --- a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalOrderMap.java +++ b/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalOrderMap.java @@ -20,9 +20,11 @@ public class TransactionalOrderMap extends TransactionalElementMap implem @Override protected void assertIsRefParam(Parameter refP) { - if (!refP.getInterpretation().equals(INTERPRETATION_ORDER_REF)) { - String msg = "{0} is not an Order reference as its interpretation is not {1}"; //$NON-NLS-1$ - throw new StrolchException(MessageFormat.format(msg, refP.getLocator(), INTERPRETATION_ORDER_REF)); + String interpretation = refP.getInterpretation(); + if (!interpretation.equals(INTERPRETATION_ORDER_REF)) { + String msg = "{0} is not an Order reference as its interpretation is not {1} it is {2}"; //$NON-NLS-1$ + throw new StrolchException(MessageFormat.format(msg, refP.getLocator(), INTERPRETATION_ORDER_REF, + interpretation)); } if (refP.getUom().equals(UOM_NONE)) { diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalResourceMap.java b/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalResourceMap.java index 9893fc8ca..4ca94a3e4 100644 --- a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalResourceMap.java +++ b/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalResourceMap.java @@ -20,9 +20,11 @@ public class TransactionalResourceMap extends TransactionalElementMap @Override protected void assertIsRefParam(Parameter refP) { - if (!refP.getInterpretation().equals(INTERPRETATION_RESOURCE_REF)) { - String msg = "{0} is not an Resource reference as its interpretation is not {1}"; //$NON-NLS-1$ - throw new StrolchException(MessageFormat.format(msg, refP.getLocator(), INTERPRETATION_RESOURCE_REF)); + String interpretation = refP.getInterpretation(); + if (!interpretation.equals(INTERPRETATION_RESOURCE_REF)) { + String msg = "{0} is not an Resource reference as its interpretation is not {1} it is {2}"; //$NON-NLS-1$ + throw new StrolchException(MessageFormat.format(msg, refP.getLocator(), INTERPRETATION_RESOURCE_REF, + interpretation)); } if (refP.getUom().equals(UOM_NONE)) {