Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-3434. svn merge -c 1339712 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339725 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-05-17 17:22:59 +00:00
parent 0319ebb42a
commit 84a39c2711
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -67,6 +67,9 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-1153. dfsnodelist.jsp should handle invalid input parameters. HDFS-1153. dfsnodelist.jsp should handle invalid input parameters.
(Ravi Phulari via eli) (Ravi Phulari via eli)
HDFS-3434. InvalidProtocolBufferException when visiting DN
browseDirectory.jsp (eli)
Release 2.0.0-alpha - UNRELEASED Release 2.0.0-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
View File

@ -165,9 +165,9 @@ public class NameNodeHttpServer {
httpServer.setAttribute("datanode.https.port", datanodeSslPort httpServer.setAttribute("datanode.https.port", datanodeSslPort
.getPort()); .getPort());
} }
httpServer.setAttribute("name.node", nn); httpServer.setAttribute(NAMENODE_ATTRIBUTE_KEY, nn);
httpServer.setAttribute("name.node.address", bindAddress); httpServer.setAttribute(NAMENODE_ADDRESS_ATTRIBUTE_KEY, nn.getNameNodeAddress());
httpServer.setAttribute("name.system.image", nn.getFSImage()); httpServer.setAttribute(FSIMAGE_ATTRIBUTE_KEY, nn.getFSImage());
httpServer.setAttribute(JspHelper.CURRENT_CONF, conf); httpServer.setAttribute(JspHelper.CURRENT_CONF, conf);
setupServlets(httpServer, conf); setupServlets(httpServer, conf);
httpServer.start(); httpServer.start();

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java
View File

@ -114,7 +114,7 @@ public class TestJspHelper {
UserGroupInformation ugi = JspHelper.getUGI(context, request, conf); UserGroupInformation ugi = JspHelper.getUGI(context, request, conf);
Token<? extends TokenIdentifier> tokenInUgi = ugi.getTokens().iterator() Token<? extends TokenIdentifier> tokenInUgi = ugi.getTokens().iterator()
.next(); .next();
Assert.assertEquals(tokenInUgi.getService().toString(), expected); Assert.assertEquals(expected, tokenInUgi.getService().toString());
} }