[ 
https://issues.apache.org/jira/browse/SCB-315?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16356765#comment-16356765
 ] 

ASF GitHub Bot commented on SCB-315:
------------------------------------

WillemJiang closed pull request #549: [SCB-315] Resolve the Registry-Service UT 
test fail
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/549
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/AddressResolverConfig.java
 
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/AddressResolverConfig.java
index 1b1a80481..90f3865da 100644
--- 
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/AddressResolverConfig.java
+++ 
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/AddressResolverConfig.java
@@ -109,8 +109,9 @@ public static AddressResolverOptions 
getAddressResover(String tag, Configuration
 
   private static List<String> getStringListProperty(Configuration configSource,
       List<String> defaultValue, String... keys) {
+    configSource = guardConfigSource(configSource);
     if (configSource == null) {
-      configSource = (Configuration) 
DynamicPropertyFactory.getBackingConfigurationSource();
+      return defaultValue;
     }
     for (String key : keys) {
       String[] vals = configSource.getStringArray(key);
@@ -122,8 +123,9 @@ public static AddressResolverOptions 
getAddressResover(String tag, Configuration
   }
 
   private static int getPositiveIntProperty(Configuration configSource, int 
defaultValue, String... keys) {
+    configSource = guardConfigSource(configSource);
     if (configSource == null) {
-      configSource = (Configuration) 
DynamicPropertyFactory.getBackingConfigurationSource();
+      return defaultValue;
     }
     for (String key : keys) {
       Integer val = configSource.getInteger(key, null);
@@ -140,8 +142,9 @@ private static int getPositiveIntProperty(Configuration 
configSource, int defaul
 
   private static boolean getBooleanProperty(Configuration configSource, 
boolean defaultValue,
       String... keys) {
+    configSource = guardConfigSource(configSource);
     if (configSource == null) {
-      configSource = (Configuration) 
DynamicPropertyFactory.getBackingConfigurationSource();
+      return defaultValue;
     }
     for (String key : keys) {
       Boolean val = configSource.getBoolean(key, null);
@@ -151,4 +154,11 @@ private static boolean getBooleanProperty(Configuration 
configSource, boolean de
     }
     return defaultValue;
   }
+
+  private static Configuration guardConfigSource(Configuration configSource) {
+    if (configSource == null && 
DynamicPropertyFactory.getBackingConfigurationSource() != null) {
+      configSource = (Configuration) 
DynamicPropertyFactory.getBackingConfigurationSource();
+    }
+    return configSource;
+  }
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> As a SDK user, i want to custom netty dns resovl properties so that the 
> ServiceComb has to add config support
> -------------------------------------------------------------------------------------------------------------
>
>                 Key: SCB-315
>                 URL: https://issues.apache.org/jira/browse/SCB-315
>             Project: Apache ServiceComb
>          Issue Type: New Feature
>          Components: Java-Chassis
>    Affects Versions: java-chassis-1.0.0-m1
>            Reporter: jeho0815
>            Assignee: jeho0815
>            Priority: Major
>
> Default DNS resovl use the machine config, but sometimes the application want 
> to set by themselves to adapt to diffrent local or cloud enviroments



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Reply via email to