From b908fd9b1698818046df9606d70c23e0fb770586 Mon Sep 17 00:00:00 2001
From: Yiming Liu <liuyiming.vip@gmail.com>
Date: Wed, 27 Apr 2016 11:13:59 +0800
Subject: [PATCH] Fix get env properties bugs

---
 .../main/java/com/ctrip/apollo/core/MetaDomainConsts.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java b/apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java
index cbb9c2e6d..604915339 100644
--- a/apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java
+++ b/apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java
@@ -13,16 +13,17 @@ import com.ctrip.apollo.core.utils.ResourceUtils;
  * 
  * Currently, apollo supports local/dev/fat/uat/lpt/pro environments.
  */
+@SuppressWarnings({"rawtypes", "unchecked"})
 public class MetaDomainConsts {
 
-  private static Map<Env, String> domains = new HashMap<>();
+  private static Map<Env, Object> domains = new HashMap<>();
 
   public static final String DEFAULT_META_URL = "http://localhost:8080";
 
   static {
     Properties prop = new Properties();
     prop = ResourceUtils.readConfigFile("apollo-env.properties", prop);
-    Map<String, String> env = System.getenv();
+    Map env = System.getProperties();
     domains.put(Env.LOCAL,
         env.getOrDefault("local_meta", prop.getProperty("local.meta", DEFAULT_META_URL)));
     domains.put(Env.DEV,
@@ -38,6 +39,6 @@ public class MetaDomainConsts {
   }
 
   public static String getDomain(Env env) {
-    return domains.get(env);
+    return String.valueOf(domains.get(env));
   }
 }
-- 
GitLab