conflict resolution

Author: JuicyDragon

IntelliJ/src/main/java/com/nuix/innovation/enginewrapper/NuixEngine.java

@@ -79,8 +79,10 @@ protected NuixEngine() {
     }
 
     public static void closeGlobalContainer() {
-        globalContainer.close();
-        globalContainer = null;
+        if (globalContainer != null) {
+            globalContainer.close();
+            globalContainer = null;
+        }
     }
 
     /***
@@ -554,9 +556,9 @@ public NuixVersion getNuixVersion() {
      * @throws Exception Exceptions are allowed to bubble up.
      */
     public RubyScriptRunner runRubyScriptAsync(String script, @Nullable Map<String, Object> additionalVariables,
-                                                                       @Nullable Consumer<String> standardOutputReceiver,
-                                                                       @Nullable Consumer<String> errorOutputReceiver,
-                                                                       @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
+                                               @Nullable Consumer<String> standardOutputReceiver,
+                                               @Nullable Consumer<String> errorOutputReceiver,
+                                               @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
         Map<String, Object> vars = new HashMap<>();
         if (additionalVariables != null) {
             vars.putAll(additionalVariables);
@@ -567,7 +569,7 @@ public RubyScriptRunner runRubyScriptAsync(String script, @Nullable Map<String,
         RubyScriptRunner rubyScriptRunner = new RubyScriptRunner();
         rubyScriptRunner.setStandardOutputConsumer(standardOutputReceiver);
         rubyScriptRunner.setErrorOutputConsumer(errorOutputReceiver);
-        if(completedCallback != null) {
+        if (completedCallback != null) {
             rubyScriptRunner.whenScriptCompletes(completedCallback);
         }
         rubyScriptRunner.runScriptAsync(script, getNuixVersionString(), vars);
@@ -591,7 +593,7 @@ public RubyScriptRunner runRubyScriptAsync(String script, @Nullable Map<String,
      * @throws Exception Exceptions are allowed to bubble up.
      */
     public RubyScriptRunner runRubyScriptAsync(String script, @Nullable Map<String, Object> additionalVariables,
-                                                                       @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
+                                               @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
         return runRubyScriptAsync(script, additionalVariables, null, null, completedCallback);
     }
 
@@ -610,7 +612,7 @@ public RubyScriptRunner runRubyScriptAsync(String script, @Nullable Map<String,
      * @throws Exception Exceptions are allowed to bubble up.
      */
     public RubyScriptRunner runRubyScriptAsync(String script,
-                                                                       @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
+                                               @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
         return runRubyScriptAsync(script, null, null, null, completedCallback);
     }
 
@@ -637,9 +639,9 @@ public RubyScriptRunner runRubyScriptAsync(String script,
      * @throws Exception Exceptions are allowed to bubble up.
      */
     public RubyScriptRunner runRubyScriptFileAsync(File scriptFile, @Nullable Map<String, Object> additionalVariables,
-                                                                           @Nullable Consumer<String> standardOutputReceiver,
-                                                                           @Nullable Consumer<String> errorOutputReceiver,
-                                                                           @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
+                                                   @Nullable Consumer<String> standardOutputReceiver,
+                                                   @Nullable Consumer<String> errorOutputReceiver,
+                                                   @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
         Map<String, Object> vars = new HashMap<>();
         if (additionalVariables != null) {
             vars.putAll(additionalVariables);
@@ -650,7 +652,7 @@ public RubyScriptRunner runRubyScriptFileAsync(File scriptFile, @Nullable Map<St
         RubyScriptRunner rubyScriptRunner = new RubyScriptRunner();
         rubyScriptRunner.setStandardOutputConsumer(standardOutputReceiver);
         rubyScriptRunner.setErrorOutputConsumer(errorOutputReceiver);
-        if(completedCallback != null) {
+        if (completedCallback != null) {
             rubyScriptRunner.whenScriptCompletes(completedCallback);
         }
         rubyScriptRunner.runFileAsync(scriptFile, getNuixVersionString(), vars);
@@ -676,7 +678,7 @@ public RubyScriptRunner runRubyScriptFileAsync(File scriptFile, @Nullable Map<St
      * @throws Exception Exceptions are allowed to bubble up.
      */
     public RubyScriptRunner runRubyScriptFileAsync(File scriptFile, @Nullable Map<String, Object> additionalVariables,
-                                                                           @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
+                                                   @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
         return runRubyScriptFileAsync(scriptFile, additionalVariables, null, null, completedCallback);
     }
 
@@ -697,7 +699,7 @@ public RubyScriptRunner runRubyScriptFileAsync(File scriptFile, @Nullable Map<St
      * @throws Exception Exceptions are allowed to bubble up.
      */
     public RubyScriptRunner runRubyScriptFileAsync(File scriptFile,
-                                                                           @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
+                                                   @Nullable BiConsumer<Object, BiVariableMap> completedCallback) throws Exception {
         return runRubyScriptFileAsync(scriptFile, null, null, null, completedCallback);
     }