[hop] branch master updated: HOP-4024 : Create a new execution information platform (OT)

[mc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mcasters pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 9b77bc54b3 HOP-4024 : Create a new execution information platform (OT)
     new 2b218de920 Merge pull request #1689 from mattcasters/master
9b77bc54b3 is described below

commit 9b77bc54b3b9f883ef29eb69b1826a536aaf98d8
Author: Matt Casters <ma...@gmail.com>
AuthorDate: Sat Sep 17 22:44:31 2022 +0200

    HOP-4024 : Create a new execution information platform (OT)
---
 engine/src/main/java/org/apache/hop/workflow/Workflow.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/engine/src/main/java/org/apache/hop/workflow/Workflow.java b/engine/src/main/java/org/apache/hop/workflow/Workflow.java
index e1efc22698..773bfe8717 100644
--- a/engine/src/main/java/org/apache/hop/workflow/Workflow.java
+++ b/engine/src/main/java/org/apache/hop/workflow/Workflow.java
@@ -1020,10 +1020,14 @@ public abstract class Workflow extends Variables
    */
   @Override
   public void setParentWorkflow(IWorkflowEngine<WorkflowMeta> parentWorkflow) {
-    this.logLevel = parentWorkflow.getLogLevel();
-    this.log.setLogLevel(logLevel);
-    this.containerObjectId = log.getContainerObjectId();
     this.parentWorkflow = parentWorkflow;
+    if (parentWorkflow != null) {
+      this.logLevel = parentWorkflow.getLogLevel();
+    }
+    if (log != null) {
+      this.log.setLogLevel(logLevel);
+      this.containerObjectId = log.getContainerObjectId();
+    }
   }
 
   @Override