diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml index bb74ce24c17ba302731451e63009849924c51cf1..1081ded41347694b0be18561d20c5d945868c309 100644 --- a/apollo-adminservice/pom.xml +++ b/apollo-adminservice/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.8 + 0.0.9 ../pom.xml 4.0.0 diff --git a/apollo-assembly/pom.xml b/apollo-assembly/pom.xml index 72070326b3c147cc1c6e7a18df3171b4da748556..d641da304713ef6d2594a606cbdb63171591b242 100644 --- a/apollo-assembly/pom.xml +++ b/apollo-assembly/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.8 + 0.0.9 ../pom.xml 4.0.0 diff --git a/apollo-biz/pom.xml b/apollo-biz/pom.xml index 89c4b4d96b3bbc66df377189f8c889cec7909d0d..5f2b323be20c2f4c185e76dff43a92b4d4cbefd7 100644 --- a/apollo-biz/pom.xml +++ b/apollo-biz/pom.xml @@ -4,7 +4,7 @@ apollo com.ctrip.framework.apollo - 0.0.8 + 0.0.9 4.0.0 apollo-biz diff --git a/apollo-buildtools/pom.xml b/apollo-buildtools/pom.xml index a694b1fb47d29ef2e2da00b07f4a180255efaeae..77d8bb63567c4acc4db579e70eb1c228864a6107 100644 --- a/apollo-buildtools/pom.xml +++ b/apollo-buildtools/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.8 + 0.0.9 ../pom.xml 4.0.0 diff --git a/apollo-client/README.md b/apollo-client/README.md index bd0a2858e3880403ef012c0ba5b11c6e219c024a..c23b1edf1980fedf0d297746ea2f00e6684b9cf7 100644 --- a/apollo-client/README.md +++ b/apollo-client/README.md @@ -88,7 +88,7 @@ If you need this functionality, you could specify the cluster as follows: com.ctrip.framework.apollo apollo-client - 0.0.8 + 0.0.9 ## III. Client Usage diff --git a/apollo-client/pom.xml b/apollo-client/pom.xml index 4cd9a6883286a0b29db7d6261bb1c7408074681b..24e41608b3e06b7d640836599bfa5ed283d78edc 100644 --- a/apollo-client/pom.xml +++ b/apollo-client/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.8 + 0.0.9 ../pom.xml 4.0.0 diff --git a/apollo-common/pom.xml b/apollo-common/pom.xml index 4518f65058302f437bec4f36f523e047c4b1a864..d2f321ddc98d002102ad75c0da167137bff74426 100644 --- a/apollo-common/pom.xml +++ b/apollo-common/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.8 + 0.0.9 ../pom.xml 4.0.0 diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml index f8a7efa00669acea948baf43853b086cd8733a01..8bdcfec14c5544a2f5f0fdc794544144978510ae 100644 --- a/apollo-configservice/pom.xml +++ b/apollo-configservice/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.8 + 0.0.9 ../pom.xml 4.0.0 diff --git a/apollo-core/pom.xml b/apollo-core/pom.xml index 0d6e642050236446e7636da109d3876f78f9b23c..6f3ef2ad1711f9ce125bdc2b2089f91a25fd898b 100644 --- a/apollo-core/pom.xml +++ b/apollo-core/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.8 + 0.0.9 ../pom.xml 4.0.0 diff --git a/apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ClassLoaderUtil.java b/apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ClassLoaderUtil.java index c3dd9dbdd8001756f0cf9d377341fc9bad6f0c5a..669aeadc1d02242c6ec84d9942d2447c9a37103c 100644 --- a/apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ClassLoaderUtil.java +++ b/apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ClassLoaderUtil.java @@ -1,5 +1,7 @@ package com.ctrip.framework.apollo.core.utils; +import com.google.common.base.Strings; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,16 +27,18 @@ public class ClassLoaderUtil { try { URL url = loader.getResource(""); // get class path - classPath = url.getPath(); - classPath = URLDecoder.decode(classPath, "utf-8"); + if (url != null) { + classPath = url.getPath(); + classPath = URLDecoder.decode(classPath, "utf-8"); + } // 如果是jar包内的,则返回当前路径 - if (classPath.contains(".jar!")) { - logger.warn("using config file inline jar!"); + if (Strings.isNullOrEmpty(classPath) || classPath.contains(".jar!")) { classPath = System.getProperty("user.dir"); } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + } catch (Throwable ex) { + classPath = System.getProperty("user.dir"); + ex.printStackTrace(); } } diff --git a/apollo-demo/pom.xml b/apollo-demo/pom.xml index 72b297c13bb5a575a2c8bf96d8a5e86637b68dd0..d5a6d40b8447db2fee27db943fad351ba2afe498 100644 --- a/apollo-demo/pom.xml +++ b/apollo-demo/pom.xml @@ -4,7 +4,7 @@ apollo com.ctrip.framework.apollo - 0.0.8 + 0.0.9 4.0.0 apollo-demo diff --git a/apollo-portal/pom.xml b/apollo-portal/pom.xml index 3d981223f367da5d41f252626692f9b91e2a68b3..c3af43b41508cd80b854fa6632f48d65de99dc60 100644 --- a/apollo-portal/pom.xml +++ b/apollo-portal/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.8 + 0.0.9 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 8bbfc0ceb496f86de632b661b9b103de129695f9..d8319d209796c8c611249218341dce1f5944da8b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.ctrip.framework.apollo apollo - 0.0.8 + 0.0.9 Apollo pom Ctrip Configuration Center