[ambari] 16/36: Fixed compile errors from Merge trunk into branch-3.0-ams

[avijayan]

This is an automated email from the ASF dual-hosted git repository.

avijayan pushed a commit to branch branch-feature-AMBARI-23100
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit cbbca617cd5d4a9272e7e04ea85a25e145b3b8fc
Author: Siddharth Wagle <swa...@hortonworks.com>
AuthorDate: Tue Sep 26 15:56:28 2017 -0700

    Fixed compile errors from Merge trunk into branch-3.0-ams
---
 .../metrics2/sink/timeline/cache/HandleConnectExceptionTest.java     | 5 +++++
 .../server/controller/metrics/timeline/MetricsRequestHelper.java     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
 
b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
index 77aba6b..4bcc2fb 100644
--- 
a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
+++ 
b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
@@ -213,6 +213,11 @@ public class HandleConnectExceptionTest {
     }
 
     @Override
+    protected String getHostInMemoryAggregationProtocol() {
+      return "http";
+    }
+
+    @Override
     public boolean emitMetrics(TimelineMetrics metrics) {
       super.init();
       return super.emitMetrics(metrics);
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java
index ce0fe6d..062c228 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java
@@ -87,7 +87,7 @@ public class MetricsRequestHelper {
           uriBuilder.setParameter("precision", higherPrecision);
           String newSpec = uriBuilder.toString();
           connection = streamProvider.processURL(newSpec, HttpMethod.GET, 
(String) null,
-            Collections.<String, List<String>>emptyMap());
+            Collections.<String, List<String>>  emptyMap());
           if (!checkConnectionForPrecisionException(connection)) {
             throw new IOException("Encountered Precision exception : Higher 
precision request also failed.");
           }

-- 
To stop receiving notification emails like this one, please contact
avija...@apache.org.