From 4c1c187c97aaf8a09bc230100373734cec948382 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Tue, 4 Jul 2017 22:58:36 +0800
Subject: [PATCH] Fix memory pool judge.

---
 .../apm/agent/core/jvm/memorypool/MemoryPoolProvider.java   | 6 +++---
 .../{CMSCollectorModule.java => SerialCollectorModule.java} | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/{CMSCollectorModule.java => SerialCollectorModule.java} (84%)

diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java
index 1e8ef532d..31399872f 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java
@@ -39,13 +39,13 @@ public enum MemoryPoolProvider {
             return new ParallelCollectorModule(beans);
         } else if (name.indexOf("CMS") > -1) {
             // CMS collector ( -XX:+UseConcMarkSweepGC )
-            return new CMSCollectorModule(beans);
+            return null;
         } else if (name.indexOf("G1") > -1) {
             // G1 collector ( -XX:+UseG1GC )
             return null;
-        } else if (name.indexOf("Survivor Space") > -1) {
+        } else if (name.equals("Survivor Space")) {
             // Serial collector ( -XX:+UseSerialGC )
-            return null;
+            return new SerialCollectorModule(beans);
         } else {
             // Unknown
             return null;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java
similarity index 84%
rename from apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java
index 7d4d2e353..f2ea336df 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java
@@ -6,8 +6,8 @@ import java.util.List;
 /**
  * @author wusheng
  */
-public class CMSCollectorModule extends MemoryPoolModule {
-    public CMSCollectorModule(List<MemoryPoolMXBean> beans) {
+public class SerialCollectorModule extends MemoryPoolModule {
+    public SerialCollectorModule(List<MemoryPoolMXBean> beans) {
         super(beans);
     }
 
-- 
GitLab