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:58:51 UTC
svn commit: r1170698 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
Author: omalley
Date: Wed Sep 14 15:58:51 2011
New Revision: 1170698
URL: http://svn.apache.org/viewvc?rev=1170698&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/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1170698&r1=1170697&r2=1170698&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Wed Sep 14 15:58:51 2011
@@ -59,7 +59,7 @@ Release 0.20.205.0 - unreleased
(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)
@@ -125,11 +125,11 @@ Release 0.20.205.0 - unreleased
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)
@@ -151,6 +151,9 @@ Release 0.20.205.0 - unreleased
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
Propchange: hadoop/common/branches/branch-0.20-security/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 15:58:51 2011
@@ -2,6 +2,7 @@
/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730,1161741
+/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java?rev=1170698&r1=1170697&r2=1170698&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java Wed Sep 14 15:58:51 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());
}