From 2d63ca7bb6be4dfb9f3d834d2a3a2af6408aa00a Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Fri, 7 May 2010 15:16:32 +0000
Subject: [PATCH] disable GCInspector on non-Sun JVMs.  patch by Davanum
 Srinivas; reviewed by Roger Schildmeijer and jbellis for CASSANDRA-1061

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.6@942118 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                           |  1 +
 .../org/apache/cassandra/service/StorageService.java  | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1f88041cec..3edfb3511d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@
  * fix windows startup (CASSANDRA-948)
  * make concurrent_reads, concurrent_writes configurable at runtime via JMX
    (CASSANDRA-1060)
+ * disable GCInspector on non-Sun JVMs (CASSANDRA-1061)
 
 
 0.6.1
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 6a8d923cd0..1ba99733f5 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -313,7 +313,16 @@ public class StorageService implements IEndPointStateChangeSubscriber, StorageSe
         }
 
         DatabaseDescriptor.createAllDirectories();
-        GCInspector.instance.start();
+
+        try
+        {
+            GCInspector.instance.start();
+        }
+        catch (Throwable t)
+        {
+            logger_.warn("Unable to start GCInspector (currently only supported on the Sun JVM)");
+        }
+
         logger_.info("Starting up server gossip");
 
         MessagingService.instance.listen(FBUtilities.getLocalAddress());