[incubator-dubbo] branch master updated: fix issue #195: @Reference check=false不生效 (#3530)

[li...@apache.org]

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

lixiaojie 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 05a98f3  fix issue #195: @Reference check=false不生效 (#3530)
05a98f3 is described below

commit 05a98f3214d35ba13978bc88988d5a83864b8cd7
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Sun Feb 24 14:23:37 2019 +0800

    fix issue #195: @Reference check=false不生效 (#3530)
---
 .../java/com/alibaba/dubbo/config/annotation/Reference.java    |  2 +-
 .../java/org/apache/dubbo/config/AbstractReferenceConfig.java  | 10 +++++-----
 .../java/org/apache/dubbo/config/AbstractServiceConfig.java    |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
index 4c1ca97..c8f25b3 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
@@ -43,7 +43,7 @@ public @interface Reference {
 
     boolean generic() default false;
 
-    boolean injvm() default false;
+    boolean injvm() default true;
 
     boolean check() default true;
 
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java
index 325b1f1..b4a732e 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java
@@ -36,12 +36,12 @@ public abstract class AbstractReferenceConfig extends AbstractInterfaceConfig {
     /**
      * Check if service provider exists, if not exists, it will be fast fail
      */
-    protected Boolean check;
+    protected Boolean check = true;
 
     /**
      * Whether to eagle-init
      */
-    protected Boolean init;
+    protected Boolean init = false;
 
     /**
      * Whether to use generic interface
@@ -51,16 +51,16 @@ public abstract class AbstractReferenceConfig extends AbstractInterfaceConfig {
     /**
      * Whether to find reference's instance from the current JVM
      */
-    protected Boolean injvm;
+    protected Boolean injvm = false;
 
     /**
      * Lazy create connection
      */
-    protected Boolean lazy;
+    protected Boolean lazy = false;
 
     protected String reconnect;
 
-    protected Boolean sticky;
+    protected Boolean sticky = false;
 
     /**
      * Whether to support event in stub.
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
index 4fffd75..ac27644 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
@@ -47,7 +47,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig {
     /**
      * whether the service is deprecated
      */
-    protected Boolean deprecated;
+    protected Boolean deprecated = false;
 
     /**
      * The time delay register service (milliseconds)
@@ -57,7 +57,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig {
     /**
      * Whether to export the service
      */
-    protected Boolean export;
+    protected Boolean export = true;
 
     /**
      * The service weight
@@ -74,7 +74,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig {
      * after the service registered,and it needs to be enabled manually; if you want to disable the service, you also need
      * manual processing
      */
-    protected Boolean dynamic;
+    protected Boolean dynamic = false;
 
     /**
      * Whether to use token
@@ -99,7 +99,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig {
     /**
      * Whether to register
      */
-    private Boolean register;
+    private Boolean register = true;
 
     /**
      * Warm up period