Better location for validation

Author: markt-asf

java/org/apache/catalina/ha/deploy/FarmWarDeployer.java

@@ -168,9 +168,6 @@ public void start() throws Exception {
             return;
         }
         if (watchEnabled) {
-            if (getDeployDirFile().getCanonicalPath().equals(getWatchDirFile().getCanonicalPath())) {
-                throw new IllegalStateException(sm.getString("farmWarDeployer.samePathDeployWatch"));
-            }
             watcher = new WarWatcher(this, getWatchDirFile());
             if (log.isInfoEnabled()) {
                 log.info(sm.getString("farmWarDeployer.watchDir", getWatchDir()));
@@ -654,6 +651,7 @@ public File getTempDirFile() {
      */
     public void setTempDir(String tempDir) {
         this.tempDir = tempDir;
+        tempDirFile = null;
     }
 
     /**
@@ -767,6 +765,10 @@ public void setMaxValidTime(int maxValidTime) {
      */
     protected boolean copy(File from, File to) {
         try {
+            if (from.getCanonicalPath().equals(to.getCanonicalPath())) {
+                throw new IOException(sm.getString("farmWarDeployer.samePathCopy"));
+            }
+
             if (!to.exists()) {
                 if (!to.createNewFile()) {
                     log.error(sm.getString("fileNewFail", to));

java/org/apache/catalina/ha/deploy/LocalStrings.properties

@@ -34,7 +34,7 @@ farmWarDeployer.removeLocalFail=Unable to remove WAR file
 farmWarDeployer.removeStart=Cluster wide remove of web app [{0}]
 farmWarDeployer.removeTxMsg=Send cluster wide undeployment from [{0}]
 farmWarDeployer.renameFail=Failed to rename [{0}] to [{1}]
-farmWarDeployer.samePathDeployWatch=deployDir and watchDir must be different directories
+farmWarDeployer.samePathCopy=Source and destination must be different directories
 farmWarDeployer.sendEnd=Send cluster war deployment path [{0}], war [{1}] finished.
 farmWarDeployer.sendFragment=Send cluster war fragment path [{0}], war [{1}] to [{2}]
 farmWarDeployer.sendStart=Send cluster war deployment path [{0}], war [{1}] started.