support setting apollo.cacheDir from app.properties (#2317)

8d82dc19 · Erystasius · Jason Song · 89c370e1 · 8d82dc19
Commit 8d82dc19 authored Jun 07, 2019 by Erystasius Committed by Jason Song Jun 07, 2019
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java ...main/java/com/ctrip/framework/apollo/util/ConfigUtil.java +4 -0

No files found.
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
@@ -223,6 +223,10 @@ public class ConfigUtil {
      // 3. Get from server.properties
      cacheRoot = Foundation.server().getProperty("apollo.cacheDir", null);
    }
+    if (Strings.isNullOrEmpty(cacheRoot)) {
+      // 4. Get from app.properties
+      cacheRoot = Foundation.app().getProperty("apollo.cacheDir", null);
+    }

    return cacheRoot;
  }