You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/11/16 00:50:33 UTC

ambari git commit: AMBARI-8345. Views: Remove NOT NULL constraint from instance data and property tables - Slider View (srimanth)

Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 f58ec5b07 -> 92037a7f3


AMBARI-8345. Views: Remove NOT NULL constraint from instance data and property tables - Slider View (srimanth)


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

Branch: refs/heads/branch-1.7.0
Commit: 92037a7f3e936ae769d8133d0d9348424e79aa26
Parents: f58ec5b
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Sat Nov 15 15:35:14 2014 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Sat Nov 15 15:50:04 2014 -0800

----------------------------------------------------------------------
 .../ambari/view/slider/SliderAppsViewControllerImpl.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/92037a7f/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index b8ef0a4..203fd87 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -861,7 +861,11 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController {
 
     Map<String, String> hadoopConfigs = getHadoopConfigs();
     for(Entry<String, String> entry: hadoopConfigs.entrySet()) {
-      yarnConfig.set(entry.getKey(), entry.getValue());
+      String entryValue = entry.getValue();
+      if (entryValue == null) {
+        entryValue = "";
+      }
+      yarnConfig.set(entry.getKey(), entryValue);
     }
     yarnConfig.set(PROPERTY_SLIDER_SECURITY_ENABLED, hadoopConfigs.get("security_enabled"));
     if (hadoopConfigs.containsKey(PROPERTY_SLIDER_ZK_QUORUM)) {