svn commit: r942118 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java

[jbellis]

Author: jbellis
Date: Fri May  7 15:16:32 2010
New Revision: 942118

URL: http://svn.apache.org/viewvc?rev=942118&view=rev
Log:
disable GCInspector on non-Sun JVMs.  patch by Davanum Srinivas; reviewed by 
Roger Schildmeijer and jbellis for CASSANDRA-1061

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=942118&r1=942117&r2=942118&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Fri May  7 15:16:32 2010
@@ -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

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java?rev=942118&r1=942117&r2=942118&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
 Fri May  7 15:16:32 2010
@@ -313,7 +313,16 @@ public class StorageService implements I
         }
 
         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());