From fe0f67bf454f687f64ff3e76e5f4bbc4fc5cab6e Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Fri, 31 Aug 2012 06:53:34 +0800
Subject: [PATCH] change register to system properties option, default false

---
 .../alibaba/druid/stat/DruidDataSourceStatManager.java    | 6 +++---
 .../druid/support/http/stat/WebAppStatManager.java        | 8 +++++++-
 .../druid/support/spring/stat/SpringStatManager.java      | 8 +++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
index a1285f5df3..f3fe0452bf 100644
--- a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
+++ b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
@@ -100,11 +100,11 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
     public static boolean isRegisterToSystemProperty() {
         String value = System.getProperty(SYS_PROP_REGISTER_SYS_PROPERTY);
 
-        if ("false".equals(value)) {
-            return false;
+        if ("true".equals(value)) {
+            return true;
         }
 
-        return true;
+        return false;
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatManager.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatManager.java
index 09ab5f82da..882eef923a 100644
--- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatManager.java
+++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatManager.java
@@ -22,6 +22,8 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
+
 public class WebAppStatManager {
 
     public final static String             SYS_PROP_INSTANCES = "druid.web.webAppStat";
@@ -36,7 +38,11 @@ public class WebAppStatManager {
 
     public Set<Object> getWebAppStatSet() {
         if (webAppStatSet == null) {
-            webAppStatSet = getWebAppStatSet0();
+            if (DruidDataSourceStatManager.isRegisterToSystemProperty()) {
+                webAppStatSet = getWebAppStatSet0();
+            } else {
+                webAppStatSet = new CopyOnWriteArraySet<Object>();                
+            }
         }
 
         return webAppStatSet;
diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatManager.java b/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatManager.java
index 02658513fe..11db8c1fe3 100644
--- a/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatManager.java
+++ b/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatManager.java
@@ -22,6 +22,8 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
+
 public class SpringStatManager {
 
     public final static String             SYS_PROP_INSTANCES = "druid.spring.springStat";
@@ -36,7 +38,11 @@ public class SpringStatManager {
 
     public Set<Object> getSpringStatSet() {
         if (springStatSet == null) {
-            springStatSet = getSpringStatSetFromSysProperty();
+            if (DruidDataSourceStatManager.isRegisterToSystemProperty()) {
+                springStatSet = getSpringStatSetFromSysProperty();
+            } else {
+                springStatSet = new CopyOnWriteArraySet<Object>();                
+            }
         }
 
         return springStatSet;