[PDI-14305] Get Mails (POP3/IMAP) Not substituting environment variab…

…les for target directories
pentaho · Sep 3, 2015 · 1a2388e · 1a2388e
1 parent bcba55a
commit 1a2388e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/engine/src/org/pentaho/di/job/entries/getpop/JobEntryGetPOP.java b/engine/src/org/pentaho/di/job/entries/getpop/JobEntryGetPOP.java
@@ -726,6 +726,10 @@ public String getRealPassword() {
   public String getAttachmentFolder() {
     return attachmentfolder;
   }
+
+  public String getRealAttachmentFolder() {
+    return environmentSubstitute( getAttachmentFolder() );
+  }
 
   public void setAttachmentFolder( String foldername ) {
     this.attachmentfolder = foldername;
@@ -1313,13 +1317,13 @@ String createOutputDirectory( int folderType ) throws KettleException, FileSyste
     String folderName = "";
     switch ( folderType ) {
       case JobEntryGetPOP.FOLDER_OUTPUT:
-        folderName = getOutputDirectory();
+        folderName = getRealOutputDirectory();
         break;
       case JobEntryGetPOP.FOLDER_ATTACHMENTS:
         if ( isSaveAttachment() && isDifferentFolderForAttachment() ) {
-          folderName = getAttachmentFolder();
+          folderName = getRealAttachmentFolder();
         } else {
-          folderName = getOutputDirectory();
+          folderName = getRealOutputDirectory();
         }
         break;
     }