ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-11259. Slider view build break
Date Wed, 20 May 2015 01:02:56 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 6a3c1e340 -> d42c2113d


AMBARI-11259. Slider view build break


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d42c2113
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d42c2113
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d42c2113

Branch: refs/heads/trunk
Commit: d42c2113d8dbccb122eb944a2fd4e38e60024e02
Parents: 6a3c1e3
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Tue May 19 18:02:45 2015 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Tue May 19 18:02:45 2015 -0700

----------------------------------------------------------------------
 .../ambari/view/slider/rest/client/SliderAppMasterClient.java      | 2 +-
 .../ambari/view/slider/rest/client/SliderAppMetricsHelper.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d42c2113/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java
index 7393d65..7741cd2 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java
@@ -271,7 +271,7 @@ public class SliderAppMasterClient extends BaseHttpClient {
       InputStream jmxStream = null;
       Map<String, String> headers = new HashMap<String, String>();
       try {
-        jmxStream = streamProvider.readFrom(jmxUrl, "GET", null, headers);
+        jmxStream = streamProvider.readFrom(jmxUrl, "GET", (String)null, headers);
       } catch (IOException e) {
         logger.error(String.format(
             "Unable to access JMX endpoint at %s. Error %s", jmxUrl,

http://git-wip-us.apache.org/repos/asf/ambari/blob/d42c2113/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMetricsHelper.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMetricsHelper.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMetricsHelper.java
index 658ee37..6d5e89e 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMetricsHelper.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMetricsHelper.java
@@ -67,7 +67,7 @@ public class SliderAppMetricsHelper {
       String fullUrl = spec + "?" + params;
       logger.debug("Metrics request url = " + fullUrl);
       reader = new BufferedReader(new InputStreamReader(context
-          .getURLStreamProvider().readFrom(fullUrl, "GET", null, headers)));
+          .getURLStreamProvider().readFrom(fullUrl, "GET", (String)null, headers)));
 
       TimelineMetrics timelineMetrics = timelineObjectReader.readValue(reader);
       logger.debug("Timeline metrics response => " + timelineMetrics);


Mime
View raw message