Author: rkanter
Date: Mon Feb  4 18:02:00 2013
New Revision: 1442233

URL: http://svn.apache.org/viewvc?rev=1442233&view=rev
Log:
OOZIE-1027 XTestCase.delete() can cause tests to fail if it runs into a 
dangling symlink (rkanter via tucu)

Modified:
    
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/test/XTestCase.java
    oozie/branches/branch-3.3/release-log.txt

Modified: 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1442233&r1=1442232&r2=1442233&view=diff
==============================================================================
--- 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/test/XTestCase.java
 (original)
+++ 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/test/XTestCase.java
 Mon Feb  4 18:02:00 2013
@@ -414,6 +414,11 @@ public abstract class XTestCase extends 
                 throw new RuntimeException(XLog.format("could not delete path 
[{0}]", file.getAbsolutePath()));
             }
         }
+        else {
+            // With a dangling symlink, exists() doesn't return true so try to 
delete it anyway; we fail silently in case the file
+            // truely doesn't exist
+            file.delete();
+        }
     }
 
     /**

Modified: oozie/branches/branch-3.3/release-log.txt
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1442233&r1=1442232&r2=1442233&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Feb  4 18:02:00 2013
@@ -1,7 +1,8 @@
 -- Oozie 3.3.2 (unreleased)
 
+OOZIE-1027 XTestCase.delete() can cause tests to fail if it runs into a 
dangling symlink (rkanter via tucu)
 OOZIE-1027 Command line mr does not support NN/JT parameters properly (Mona 
via Mohammad)
-OOZIE-1020 BulkJPAExecutor handling date-time value incorrectly.(Mona via 
Mohammad)`
+OOZIE-1020 BulkJPAExecutor handling date-time value incorrectly.(Mona via 
Mohammad)
 OOZIE-967 Coordinator action window in web UI never finishes refreshing 
(kinley via tucu)
 OOZIE-1024 ooziedb.sh script should keep OOZIE_CONFIG, OOZIE_LOG, and 
OOZIE_DATA if previously set (rkanter via tucu)
 OOZIE-1023 Docs list OOZIE_CONF instead of OOZIE_CONFIG env var (rkanter via 
tucu)


Reply via email to