Merge pull request pentaho#4943 from bmorrise/BACKLOG-21573

[BACKLOG-21573] Fix for sending resources to server
mutaohah · Feb 19, 2018 · fd4b1ce · fd4b1ce
2 parents e8e1adb + c641aa2
commit fd4b1ce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/...ava/org/pentaho/di/engine/configuration/impl/pentaho/DefaultRunConfigurationExecutor.java b/...ava/org/pentaho/di/engine/configuration/impl/pentaho/DefaultRunConfigurationExecutor.java
@@ -3,7 +3,7 @@
  *
  *  Pentaho Data Integration
  *
- *  Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
+ *  Copyright (C) 2017-2018 by Hitachi Vantara : http://www.pentaho.com
  *
  *  *******************************************************************************
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use
@@ -77,8 +77,8 @@ private void configureTransExecution( TransExecutionConfiguration transExecution
     if ( defaultRunConfiguration.isRemote() ) {
       setSlaveServer( transExecutionConfiguration, meta, defaultRunConfiguration, variableSpace );
     }
+    transExecutionConfiguration.setPassingExport( defaultRunConfiguration.isSendResources() );
     if ( defaultRunConfiguration.isClustered() ) {
-      transExecutionConfiguration.setPassingExport( defaultRunConfiguration.isSendResources() );
       transExecutionConfiguration.setClusterShowingTransformation( defaultRunConfiguration.isShowTransformations() );
       transExecutionConfiguration.setClusterPosting( defaultRunConfiguration.isClustered() );
       transExecutionConfiguration.setClusterPreparing( defaultRunConfiguration.isClustered() );
@@ -99,7 +99,6 @@ private void configureJobExecution( JobExecutionConfiguration jobExecutionConfig
       setSlaveServer( jobExecutionConfiguration, meta, defaultRunConfiguration, variableSpace );
     }
     jobExecutionConfiguration.setPassingExport( defaultRunConfiguration.isSendResources() );
-
     if ( defaultRunConfiguration.isPentaho() && repository != null ) {
       sendNow( repository, (AbstractMeta) variableSpace );
     }

diff --git a/...org/pentaho/di/engine/configuration/impl/pentaho/DefaultRunConfigurationExecutorTest.java b/...org/pentaho/di/engine/configuration/impl/pentaho/DefaultRunConfigurationExecutorTest.java
@@ -3,7 +3,7 @@
  *
  *  Pentaho Data Integration
  *
- *  Copyright (C) 2017 by Hitachi Vantara : http://www.pentaho.com
+ *  Copyright (C) 2017-2018 by Hitachi Vantara : http://www.pentaho.com
  *
  *  *******************************************************************************
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use
@@ -100,6 +100,18 @@ public void testExecuteLocalTrans() throws Exception {
     assertTrue( transExecutionConfiguration.isExecutingLocally() );
   }
 
+  @Test
+  public void testSendResources() throws Exception {
+    DefaultRunConfiguration defaultRunConfiguration = new DefaultRunConfiguration();
+    defaultRunConfiguration.setSendResources( true );
+
+    TransExecutionConfiguration transExecutionConfiguration = new TransExecutionConfiguration();
+
+    defaultRunConfigurationExecutor
+      .execute( defaultRunConfiguration, transExecutionConfiguration, abstractMeta, variableSpace, null );
+    assertTrue( transExecutionConfiguration.isPassingExport() );
+  }
+
   @Test
   public void testExecuteRemoteTrans() throws Exception {
     DefaultRunConfiguration defaultRunConfiguration = new DefaultRunConfiguration();