merge -r 1379092:1379093 from trunk. FIXES: HDFS-3861

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379096 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daryn Sharp 2012-08-30 19:50:24 +00:00
parent 9f94b89742
commit fb2d784ef9
2 changed files with 3 additions and 1 deletions

View File

@ -1439,6 +1439,8 @@ Release 0.23.3 - UNRELEASED
HDFS-3718. Datanode won't shutdown because of runaway DataBlockScanner
thread (Kihwal Lee via daryn)
HDFS-3861. Deadlock in DFSClient (Kihwal Lee via daryn)
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES

View File

@ -535,7 +535,7 @@ public class DFSClient implements java.io.Closeable {
* until the first output stream is created. The same instance will
* be returned until all output streams are closed.
*/
public synchronized LeaseRenewer getLeaseRenewer() throws IOException {
public LeaseRenewer getLeaseRenewer() throws IOException {
return LeaseRenewer.getInstance(authority, ugi, this);
}