Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F010310687 for ; Wed, 9 Apr 2014 11:12:00 +0000 (UTC) Received: (qmail 18834 invoked by uid 500); 9 Apr 2014 11:11:59 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 17683 invoked by uid 500); 9 Apr 2014 11:11:49 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 17282 invoked by uid 99); 9 Apr 2014 11:11:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Apr 2014 11:11:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Apr 2014 11:11:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D783E2388A9B; Wed, 9 Apr 2014 11:11:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1585932 - /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java Date: Wed, 09 Apr 2014 11:11:20 -0000 To: hdfs-commits@hadoop.apache.org From: stevel@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140409111120.D783E2388A9B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stevel Date: Wed Apr 9 11:11:20 2014 New Revision: 1585932 URL: http://svn.apache.org/r1585932 Log: HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java?rev=1585932&r1=1585931&r2=1585932&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java Wed Apr 9 11:11:20 2014 @@ -358,8 +358,8 @@ class ClusterJspHelper { nn.missingBlocksCount = getProperty(props, "NumberOfMissingBlocks") .getLongValue(); nn.httpAddress = httpAddress.toURL(); - getLiveNodeCount(getProperty(props, "LiveNodes").getValueAsText(), nn); - getDeadNodeCount(getProperty(props, "DeadNodes").getValueAsText(), nn); + getLiveNodeCount(getProperty(props, "LiveNodes").asText(), nn); + getDeadNodeCount(getProperty(props, "DeadNodes").asText(), nn); nn.softwareVersion = getProperty(props, "SoftwareVersion").getTextValue(); return nn; } @@ -373,11 +373,11 @@ class ClusterJspHelper { Map> statusMap, String props) throws IOException, MalformedObjectNameException { getLiveNodeStatus(statusMap, host, getProperty(props, "LiveNodes") - .getValueAsText()); + .asText()); getDeadNodeStatus(statusMap, host, getProperty(props, "DeadNodes") - .getValueAsText()); + .asText()); getDecommissionNodeStatus(statusMap, host, - getProperty(props, "DecomNodes").getValueAsText()); + getProperty(props, "DecomNodes").asText()); } /**