ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rle...@apache.org
Subject ambari git commit: AMBARI-12218. Host check for JDK does not fail when custom JDK is not found (rlevas)
Date Sat, 04 Jul 2015 11:58:05 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 74a345a22 -> 1cc476ed1


AMBARI-12218. Host check for JDK does not fail when custom JDK is not found (rlevas)


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

Branch: refs/heads/branch-2.1
Commit: 1cc476ed1e394fd75e5f54b97c51465a041964d4
Parents: 74a345a
Author: Robert Levas <rlevas@hortonworks.com>
Authored: Sat Jul 4 07:57:56 2015 -0400
Committer: Robert Levas <rlevas@hortonworks.com>
Committed: Sat Jul 4 07:57:56 2015 -0400

----------------------------------------------------------------------
 .../src/main/python/ambari_server/serverSetup.py          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1cc476ed/ambari-server/src/main/python/ambari_server/serverSetup.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py
index a5060eb..e76d2bc 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -414,11 +414,6 @@ class JDKSetup(object):
           properties.removeOldProp(JDK_NAME_PROPERTY)
           properties.removeOldProp(JCE_NAME_PROPERTY)
 
-          # Make sure any previously existing JDK and JCE name properties are removed. These
will
-          # confuse things in a Custom JDK scenario
-          properties.removeProp(JDK_NAME_PROPERTY)
-          properties.removeProp(JCE_NAME_PROPERTY)
-
           self._ensure_java_home_env_var_is_set(args.java_home)
           self.jdk_index = self.custom_jdk_number
           return
@@ -460,6 +455,11 @@ class JDKSetup(object):
       properties.removeOldProp(JDK_NAME_PROPERTY)
       properties.removeOldProp(JCE_NAME_PROPERTY)
 
+      # Make sure any previously existing JDK and JCE name properties are removed. These
will
+      # confuse things in a Custom JDK scenario
+      properties.removeProp(JDK_NAME_PROPERTY)
+      properties.removeProp(JCE_NAME_PROPERTY)
+
       self._ensure_java_home_env_var_is_set(args.java_home)
       return
 


Mime
View raw message