Merge branch 'master' into textarea

README.md

@@ -132,3 +132,4 @@ The project is licensed under the [Apache 2 license](https://github.com/ctripcor
 ![资产360](https://github.com/ctripcorp/apollo/blob/master/doc/images/known-users/zc360.png) 
 ![亿咖通](https://github.com/ctripcorp/apollo/blob/master/doc/images/known-users/ecarx.png) 
 ![5173](https://github.com/ctripcorp/apollo/blob/master/doc/images/known-users/5173.png) 
+![沪江](https://github.com/ctripcorp/apollo/blob/master/doc/images/known-users/hujiang.png) 

apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerV2.java

@@ -150,11 +150,6 @@ public class NotificationControllerV2 implements ReleaseMessageListener {
     if (!CollectionUtils.isEmpty(newNotifications)) {
       deferredResultWrapper.setResult(newNotifications);
     } else {
-      //register all keys
-      for (String key : watchedKeys) {
-        this.deferredResults.put(key, deferredResultWrapper);
-      }
-
       deferredResultWrapper
           .onTimeout(() -> logWatchedKeys(watchedKeys, "Apollo.LongPoll.TimeOutKeys"));
 
@@ -166,6 +161,11 @@ public class NotificationControllerV2 implements ReleaseMessageListener {
         logWatchedKeys(watchedKeys, "Apollo.LongPoll.CompletedKeys");
       });
 
+      //register all keys
+      for (String key : watchedKeys) {
+        this.deferredResults.put(key, deferredResultWrapper);
+      }
+
       logWatchedKeys(watchedKeys, "Apollo.LongPoll.RegisteredKeys");
       logger.debug("Listening {} from appId: {}, cluster: {}, namespace: {}, datacenter: {}",
           watchedKeys, appId, cluster, namespaces, dataCenter);