[incubator-dubbo] branch master updated: fixed provider set delay NullPointerException (#3957)

[il...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new e2f3346  fixed provider set delay NullPointerException (#3957)
e2f3346 is described below

commit e2f3346d9d1dff2bf6bf3ac2802e83d46b9923c0
Author: huaifeng <hu...@fanhaoyue.com>
AuthorDate: Tue Apr 30 15:52:50 2019 +0800

    fixed provider set delay NullPointerException (#3957)
    
    * fixed provider set delay NullPointerException
    
    * add getActualDelay method
    
    * simple
---
 .../src/main/java/org/apache/dubbo/config/ServiceConfig.java             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 2fbb85a..e540dc0 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -360,6 +360,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
         if (delay == null && provider != null) {
             delay = provider.getDelay();
         }
+        this.delay = delay;
         return delay != null && delay > 0;
     }