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/09/14 17:55:13 UTC
svn commit: r1170696 - in /hadoop/common/branches/branch-0.20-security-205:
CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
Author: omalley
Date: Wed Sep 14 15:55:13 2011
New Revision: 1170696
URL: http://svn.apache.org/viewvc?rev=1170696&view=rev
Log:
HDFS-2328. HFTP throws NPE if security is enabled locally, but not
remotely. (omalley)
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1170696&r1=1170695&r2=1170696&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Wed Sep 14 15:55:13 2011
@@ -47,7 +47,7 @@ Release 0.20.205.0 - 2011.09.12
(Todd Lipcon via eli)
HADOOP-7400. Fix HdfsProxyTests fails when the -Dtest.build.dir
- and -Dbuild.test is set a dir other than build dir (gkesavan).
+ and -Dbuild.test is set a dir other than build dir (gkesavan)
MAPREDUCE-2650. back-port MAPREDUCE-2238 to 0.20-security.
(Sherry Chen via mahadev)
@@ -113,11 +113,11 @@ Release 0.20.205.0 - 2011.09.12
HDFS-1122. client block verification may result in blocks in
DataBlockScanner prematurely. (Sam Rash via jitendra)
- HADOOP-6722. NetUtils.connect should check that it hasn't connected a socket
- to itself. (Todd Lipcon via suresh)
+ HADOOP-6722. NetUtils.connect should check that it hasn't connected a
+ socket to itself. (Todd Lipcon via suresh)
- HDFS-1779. After NameNode restart , Clients can not read partial files even after
- client invokes Sync. (Uma Maheswara Rao G via jitendra)
+ HDFS-1779. After NameNode restart , Clients can not read partial files
+ even after client invokes Sync. (Uma Maheswara Rao G via jitendra)
HDFS-1197. Blocks are considered "complete" prematurely after
commitBlockSynchronization or DN restart. (Todd Lipcon via jitendra)
@@ -139,6 +139,9 @@ Release 0.20.205.0 - 2011.09.12
MAPREDUCE-2549. Fix resource leaks in Eclipse plugin. (Devaraj K via
acmurthy)
+ HDFS-2328. HFTP throws NPE if security is enabled locally, but not
+ remotely. (omalley)
+
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Modified: hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java?rev=1170696&r1=1170695&r2=1170696&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java Wed Sep 14 15:55:13 2011
@@ -180,9 +180,12 @@ public class HftpFileSystem extends File
//since we don't already have a token, go get one over https
if (delegationToken == null) {
- setDelegationToken(getDelegationToken(null));
- renewer.addTokenToRenew(this);
- LOG.debug("Created new DT for " + delegationToken.getService());
+ Token<?> newToken = getDelegationToken(null);
+ if (newToken != null) {
+ setDelegationToken(newToken);
+ renewer.addTokenToRenew(this);
+ LOG.debug("Created new DT for " + delegationToken.getService());
+ }
} else {
LOG.debug("Found existing DT for " + delegationToken.getService());
}