Force to load remote job/trans via VFS

zhicwu · Sep 21, 2017 · 7f43cad · 7f43cad
1 parent d7320e6
commit 7f43cad
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/pentaho-kettle/src/main/java/org/pentaho/di/job/entries/job/JobEntryJob.java b/pentaho-kettle/src/main/java/org/pentaho/di/job/entries/job/JobEntryJob.java
@@ -1243,8 +1243,8 @@ public JobMeta getJobMeta(Repository rep, IMetaStore metaStore, VariableSpace sp
                         }
                     }
 
-                    if (jobMeta == null && ResourceDefinitionHelper.fileExists(realFileName)) {
-                        logBasic("Loading job from [" + realFileName + "]...");
+                    if (jobMeta == null && !ResourceDefinitionHelper.containsVariable(realFileName)) {
+                        logBasic("Loading job [" + realFileName + "]...");
                         jobMeta = new JobMeta(tmpSpace, realFileName, rep, metaStore, null);
                     }
                     break;

diff --git a/pentaho-kettle/src/main/java/org/pentaho/di/job/entries/trans/JobEntryTrans.java b/pentaho-kettle/src/main/java/org/pentaho/di/job/entries/trans/JobEntryTrans.java
@@ -1267,8 +1267,8 @@ public TransMeta getTransMeta(Repository rep, IMetaStore metaStore, VariableSpac
                             // fall back to try loading from file system (transMeta is going to be null)
                         }
                     }
-                    if (transMeta == null && ResourceDefinitionHelper.fileExists(realFileName)) {
-                        logBasic("Loading transformation from [" + realFileName + "]");
+                    if (transMeta == null && !ResourceDefinitionHelper.containsVariable(realFileName)) {
+                        logBasic("Loading transformation [" + realFileName + "]...");
                         transMeta = new TransMeta(realFileName, metaStore, rep, true, tmpSpace, null);
                     }
                     break;

diff --git a/pentaho-kettle/src/main/java/org/pentaho/di/trans/StepWithMappingMeta.java b/pentaho-kettle/src/main/java/org/pentaho/di/trans/StepWithMappingMeta.java
@@ -92,8 +92,8 @@ public static synchronized TransMeta loadMappingMeta(StepWithMappingMeta executo
                             // fall back to try loading from file system (transMeta is going to be null)
                         }
                     }
-                    if (mappingTransMeta == null && ResourceDefinitionHelper.fileExists(realFileName)) {
-                        LogChannel.GENERAL.logDetailed("Loading transformation from [" + realFileName + "]...");
+                    if (mappingTransMeta == null && !ResourceDefinitionHelper.containsVariable(realFileName)) {
+                        LogChannel.GENERAL.logDetailed("Loading transformation [" + realFileName + "]...");
                         mappingTransMeta = new TransMeta(realFileName, metaStore, rep, true, tmpSpace, null);
                     }
                 } catch (Exception e) {

diff --git a/pentaho-kettle/src/main/java/org/pentaho/di/trans/steps/jobexecutor/JobExecutorMeta.java b/pentaho-kettle/src/main/java/org/pentaho/di/trans/steps/jobexecutor/JobExecutorMeta.java
@@ -648,7 +648,7 @@ public static final synchronized JobMeta loadJobMeta(JobExecutorMeta executorMet
                             // fall back to try loading from file system (mappingJobMeta is going to be null)
                         }
                     }
-                    if (mappingJobMeta == null && ResourceDefinitionHelper.fileExists(realFileName)) {
+                    if (mappingJobMeta == null && !ResourceDefinitionHelper.containsVariable(realFileName)) {
                         LogChannel.GENERAL.logDetailed("Loading job [" + realFileName + "]...");
                         mappingJobMeta = new JobMeta(tmpSpace, realFileName, rep, metaStore, null);
                     }