Author: kfujino
Date: Thu Apr 18 02:10:26 2013
New Revision: 1469138
URL: http://svn.apache.org/r1469138
Log:
Make sure that war is installed on the local container before installed on
other cluster nodes.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=1469138&r1=1469137&r2=1469138&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Thu
Apr 18 02:10:26 2013
@@ -444,11 +444,23 @@ public class FarmWarDeployer extends Clu
public void fileModified(File newWar) {
try {
File deployWar = new File(getDeployDirFile(), newWar.getName());
- copy(newWar, deployWar);
ContextName cn = new ContextName(deployWar.getName());
if (log.isInfoEnabled())
log.info(sm.getString("farmWarDeployer.modInstall",
cn.getName(), deployWar.getAbsolutePath()));
+ // install local
+ if (!isServiced(cn.getName())) {
+ addServiced(cn.getName());
+ try {
+ copy(newWar, deployWar);
+ check(cn.getName());
+ } finally {
+ removeServiced(cn.getName());
+ }
+ } else {
+ log.error(sm.getString("farmWarDeployer.servicingDeploy",
+ cn.getName(), deployWar.getName()));
+ }
install(cn.getName(), deployWar);
} catch (Exception x) {
log.error(sm.getString("farmWarDeployer.modInstallFail"), x);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
