You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by zh...@apache.org on 2017/11/21 00:33:02 UTC

ranger git commit: RANGER-1861:There are errors when the 'ranger-kms start' command was executed

Repository: ranger
Updated Branches:
  refs/heads/master 10051777e -> 8ab766846


RANGER-1861:There are errors when the 'ranger-kms start' command was executed

Signed-off-by: zhangqiang2 <zh...@zte.com.cn>


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

Branch: refs/heads/master
Commit: 8ab766846538ddcb3dd56dc11c174c6a8e3ad83c
Parents: 1005177
Author: peng.jianhua <pe...@zte.com.cn>
Authored: Thu Nov 16 17:39:13 2017 +0800
Committer: zhangqiang2 <zh...@zte.com.cn>
Committed: Mon Nov 20 19:13:21 2017 -0500

----------------------------------------------------------------------
 .../java/org/apache/ranger/server/tomcat/EmbeddedServer.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/8ab76684/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
index 40eed86..eac0dac 100644
--- a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
+++ b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
@@ -72,9 +72,10 @@ public class EmbeddedServer {
 	public EmbeddedServer(String[] args) {
 		if (args.length > 0) {
 			configFile = args[0];
+		} else {
+			XMLUtils.loadConfig(DEFAULT_CONFIG_FILENAME, serverConfigProperties);
 		}
-        XMLUtils.loadConfig(CORE_SITE_CONFIG_FILENAME, serverConfigProperties);
-        XMLUtils.loadConfig(DEFAULT_CONFIG_FILENAME, serverConfigProperties);
+		XMLUtils.loadConfig(CORE_SITE_CONFIG_FILENAME, serverConfigProperties);
         XMLUtils.loadConfig(configFile, serverConfigProperties);
 	}