Improved error messages for missing script context variables as per

issue #632
MangoAutomation · Mar 14, 2016 · 428ed94 · 428ed94
1 parent 83b7d8b
commit 428ed94
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Core/src/com/serotonin/m2m2/rt/script/ScriptExecutor.java b/Core/src/com/serotonin/m2m2/rt/script/ScriptExecutor.java
@@ -43,7 +43,7 @@ public Map<String, IDataPointValueSource> convertContext(List<IntStringPair> con
             DataPointRT point = Common.runtimeManager.getDataPoint(contextEntry.getKey());
             if (point == null)
                 throw new DataPointStateException(contextEntry.getKey(), new TranslatableMessage(
-                        "event.meta.pointMissing"));
+                        "event.meta.pointMissing", contextEntry.getValue(), contextEntry.getKey()));
             converted.put(contextEntry.getValue(), point);
         }
 
@@ -62,7 +62,7 @@ public static Map<String, IDataPointValueSource> convertScriptContext(List<Scrip
             DataPointRT point = Common.runtimeManager.getDataPoint(contextEntry.getDataPointId());
             if (point == null)
                 throw new DataPointStateException(contextEntry.getDataPointId(), new TranslatableMessage(
-                        "event.meta.pointMissing"));
+                        "event.meta.pointMissing", contextEntry.getVariableName(), contextEntry.getDataPointId()));
             converted.put(contextEntry.getVariableName(), point);
         }