fix merge

seaside1 · Jan 6, 2025 · c5706bc · c5706bc
1 parent d0b0ee5
commit c5706bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/org/openhab/automation/jrule/internal/engine/JRuleEngine.java b/src/main/java/org/openhab/automation/jrule/internal/engine/JRuleEngine.java
@@ -526,7 +526,7 @@ public JRuleBuilder createJRuleBuilder(String ruleName, JRule jRule, Method meth
                     method.invoke(jRule);
                 }
             } catch (InvocationTargetException e) {
-                logError("Error in rule: {}\ntarget: {}", ExceptionUtils.getStackTrace(e),
+                logError("Error in rule: {}k\ntarget: {}", ExceptionUtils.getStackTrace(e),
                         ExceptionUtils.getStackTrace(e.getCause()));
             } catch (IllegalAccessException | IllegalArgumentException | SecurityException e) {
                 logError("Error calling rule method '{}#{}': {}", method.getDeclaringClass().getName(),

diff --git a/src/test/java/org/openhab/automation/jrule/rules/user/TestRules.java b/src/test/java/org/openhab/automation/jrule/rules/user/TestRules.java
@@ -159,6 +159,8 @@ public class TestRules extends JRule {
     public static final String TAG_CUSTOM = "custom";
     public static final String NAME_STARTUP_TRIGGERED = "startup triggered";
 
+    private boolean startupTriggerWasCalled;
+
     @JRuleTag({ TAG_CUSTOM })
     @JRuleName(NAME_SWITCH_ITEM_RECEIVED_ANY_COMMAND)
     @JRuleWhenItemReceivedCommand(item = ITEM_RECEIVING_COMMAND_SWITCH)
@@ -441,6 +443,7 @@ public void getTagsAndMetadata() {
     @JRuleName(NAME_STARTUP_TRIGGERED)
     @JRuleWhenStartup(level = 50)
     public void startupTriggered(JRuleStartupEvent evt) {
+        startupTriggerWasCalled = true;
         logInfo("Startup Event: '{}'", evt.getStartupLevel());
     }