Skip to content

Commit

Permalink
PAYARA-444 fixes payara#385 GLASSFISH-21371
Browse files Browse the repository at this point in the history
  • Loading branch information
Steve Millidge committed Aug 30, 2015
1 parent a19f9f3 commit f3e2de1
Showing 1 changed file with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/

// Portions Copyright [2015] [C2B2 Consulting Limited]
package org.glassfish.deployment.admin;

import java.net.URI;
Expand Down Expand Up @@ -81,7 +81,6 @@
import java.util.logging.Logger;

import org.glassfish.api.ActionReport.ExitCode;
import org.glassfish.api.admin.AccessRequired;
import org.glassfish.api.admin.AccessRequired.AccessCheck;
import org.glassfish.api.admin.AdminCommandSecurity;
import org.glassfish.api.admin.ParameterMap;
Expand Down Expand Up @@ -626,10 +625,18 @@ private void moveAppFilesToPermanentLocation(
final Logger logger) throws IOException {
final File finalUploadDir = deploymentContext.getAppInternalDir();
final File finalAltDDDir = deploymentContext.getAppAltDDDir();

if ( ! finalUploadDir.mkdirs()) {
logger.log(Level.FINE," Attempting to create upload directory {0} was reported as failed; attempting to continue",
new Object[] {finalUploadDir.getAbsolutePath()});
}

// PAYAYRA-444 GLASSFISH-21371
if ( ! finalAltDDDir.mkdirs()) {
logger.log(Level.FINE," Attempting to create altdd directory {0} was reported as failed; attempting to continue",
new Object[] {finalAltDDDir.getAbsolutePath()});
}

safeCopyOfApp = DeploymentCommandUtils.renameUploadedFileOrCopyInPlaceFile( finalUploadDir, originalPathValue, logger, env);
safeCopyOfDeploymentPlan = DeploymentCommandUtils.renameUploadedFileOrCopyInPlaceFile( finalUploadDir, deploymentplan, logger, env);
safeCopyOfAltDD = DeploymentCommandUtils.renameUploadedFileOrCopyInPlaceFile( finalAltDDDir, altdd, logger, env);
Expand Down

0 comments on commit f3e2de1

Please sign in to comment.