You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 04:35:19 UTC
svn commit: r1077045 -
/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/Trash.java
Author: omalley
Date: Fri Mar 4 03:35:19 2011
New Revision: 1077045
URL: http://svn.apache.org/viewvc?rev=1077045&view=rev
Log:
commit f1b50078990a50c80b603b223dc30ebfa47a7839
Author: Jakob Homan <jh...@yahoo-inc.com>
Date: Thu Oct 29 19:11:25 2009 -0700
HADOOP:6344 from https://issues.apache.org/jira/secure/attachment/12423634/HDFS-740-for-Y20.patch
+++ b/YAHOO-CHANGES.txt
+ HADOOP-6344. rm and rmr immediately delete files rather than sending
+ to trash, despite trash being enabled, if a user is over-quota. (jhoman)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/Trash.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/Trash.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/Trash.java?rev=1077045&r1=1077044&r2=1077045&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/Trash.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/Trash.java Fri Mar 4 03:35:19 2011
@@ -123,7 +123,8 @@ public class Trash extends Configured {
}
} catch (IOException e) {
LOG.warn("Can't create trash directory: "+baseTrashPath);
- return false;
+ cause = e;
+ break;
}
try {
//