HBASE-15609 Addendum fix compilation error
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/05378cbf Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/05378cbf Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/05378cbf Branch: refs/heads/hbase-12439 Commit: 05378cbf69957b76e8559185ea20235242a8b2e6 Parents: 97ad33c Author: zhangduo <zhang...@apache.org> Authored: Mon May 9 20:45:04 2016 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Mon May 9 20:45:04 2016 +0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/master/ClusterStatusPublisher.java | 3 ++- .../test/java/org/apache/hadoop/hbase/client/TestResult.java | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/05378cbf/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java index e90aae6..194e023 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java @@ -59,6 +59,7 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.ScheduledChore; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos; import org.apache.hadoop.hbase.util.Addressing; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @@ -332,7 +333,7 @@ public class ClusterStatusPublisher extends ScheduledChore { @Override protected void encode(ChannelHandlerContext channelHandlerContext, ClusterStatus clusterStatus, List<Object> objects) { - ClusterStatusProtos.ClusterStatus csp = clusterStatus.convert(); + ClusterStatusProtos.ClusterStatus csp = ProtobufUtil.convert(clusterStatus); objects.add(new DatagramPacket(Unpooled.wrappedBuffer(csp.toByteArray()), isa)); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/05378cbf/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java index 6baf9e0..0e93ee0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java @@ -244,12 +244,6 @@ public class TestResult extends TestCase { LOG.debug("As expected: " + ex.getMessage()); } try { - emptyResult.addResults(new RegionLoadStats(0, 0, 0)); - fail("UnsupportedOperationException should have been thrown!"); - } catch (UnsupportedOperationException ex) { - LOG.debug("As expected: " + ex.getMessage()); - } - try { emptyResult.setExists(true); fail("UnsupportedOperationException should have been thrown!"); } catch (UnsupportedOperationException ex) {
