Follow-up on previous merge to fix compilation

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@39837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2012-07-26 21:16:52 +00:00
parent 68b4af4b11
commit 59236895ae

View File

@@ -392,16 +392,17 @@ public class ModuleManagementTool implements LogOutput
mappingTarget = mappingTarget.trim(); //trim whitespace mappingTarget = mappingTarget.trim(); //trim whitespace
// Run throught the files one by one figuring out what we are going to do during the copy // Run throught the files one by one figuring out what we are going to do during the copy
calculateCopyToWar(ampFileLocation, warFileLocation, mappingSource, mappingTarget, installedFiles, preview, forceInstall); calculateCopyToWar(ampFileLocation, warFileLocation, mappingSource, mappingTarget, installedFiles, preview, forceInstall);
// Get a reference to the source folder (if it isn't present don't do anything) // Get a reference to the source folder (if it isn't present don't do anything)
TFile source = new TFile(ampFileLocation + "/" + mappingSource); TFile source = new TFile(ampFileLocation + "/" + mappingSource);
if (source != null && source.list() != null) if (source != null && source.list() != null)
{ {
// Add to the list of directory changes so we can implement the changes later. // Add to the list of directory changes so we can implement the changes later.
String sourceDir = ampFileLocation + mappingSource; String sourceDir = ampFileLocation + mappingSource;
String destinationDir = warFileLocation + mappingTarget; String destinationDir = warFileLocation + mappingTarget;
dirChanges.put(sourceDir, destinationDir); dirChanges.put(sourceDir, destinationDir);
}
} }
} }