Author: kfujino Date: Fri Apr 19 05:46:16 2013 New Revision: 1469703 URL: http://svn.apache.org/r1469703 Log: trivial improvement. -check cluster members before sending replicate message. -avoid unnecessary calculating of Iteration count for background processing.
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=1469703&r1=1469702&r2=1469703&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Fri Apr 19 05:46:16 2013 @@ -355,6 +355,8 @@ public class FarmWarDeployer extends Clu @Override public void install(String contextName, File webapp) throws IOException { Member[] members = getCluster().getMembers(); + if (members.length == 0) return; + Member localMember = getCluster().getLocalMember(); FileMessageFactory factory = FileMessageFactory.getInstance(webapp, false); @@ -402,15 +404,17 @@ public class FarmWarDeployer extends Clu @Override public void remove(String contextName, boolean undeploy) throws IOException { - if (log.isInfoEnabled()) - log.info(sm.getString("farmWarDeployer.removeStart", contextName)); - Member localMember = getCluster().getLocalMember(); - UndeployMessage msg = new UndeployMessage(localMember, System - .currentTimeMillis(), "Undeploy:" + contextName + ":" - + System.currentTimeMillis(), contextName); - if (log.isDebugEnabled()) - log.debug(sm.getString("farmWarDeployer.removeTxMsg", contextName)); - cluster.send(msg); + if (getCluster().getMembers().length > 0) { + if (log.isInfoEnabled()) + log.info(sm.getString("farmWarDeployer.removeStart", contextName)); + Member localMember = getCluster().getLocalMember(); + UndeployMessage msg = new UndeployMessage(localMember, System + .currentTimeMillis(), "Undeploy:" + contextName + ":" + + System.currentTimeMillis(), contextName); + if (log.isDebugEnabled()) + log.debug(sm.getString("farmWarDeployer.removeTxMsg", contextName)); + cluster.send(msg); + } // remove locally if (undeploy) { try { @@ -551,9 +555,9 @@ public class FarmWarDeployer extends Clu */ @Override public void backgroundProcess() { - if (started) { + if (started && watchEnabled) { count = (count + 1) % processDeployFrequency; - if (count == 0 && watchEnabled) { + if (count == 0) { watcher.check(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org