cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [2/6] git commit: Remove jvm revision checks.. for now
Date Thu, 08 Aug 2013 18:03:55 GMT
Remove jvm revision checks.. for now


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50b40e91
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50b40e91
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50b40e91

Branch: refs/heads/cassandra-2.0.0
Commit: 50b40e91f0605f5dea56994fe4de47dfd6e46b36
Parents: 8ee09f7
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Aug 8 13:03:08 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Aug 8 13:03:08 2013 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/service/CassandraDaemon.java | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50b40e91/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index f49d549..20c70e7 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -157,7 +157,7 @@ public class CassandraDaemon
         {
             logger.warn("Non-Oracle JVM detected.  Some features, such as immediate unmap
of compacted SSTables, may not work as intended");
         }
-        else
+     /*   else
         {
             String[] java_version = javaVersion.split("_");
             String java_major = java_version[0];
@@ -172,18 +172,8 @@ public class CassandraDaemon
                 logger.info("Unable to parse java version {}", Arrays.toString(java_version));
                 java_minor = 32;
             }
-            if (java_major.equals("1.6.0"))
-            {
-                // These need to be updated from time to time, but these are currently valid
(12.18.2012)
-                if (java_minor < 29)
-                    // Seen to be a major contributing factor for heap and load issues
-                    logger.error("Your JVM is out of date. Please upgrade to the newest Oracle
Java 6.");
-                else if (java_minor < 32)
-                    // Updates 32+ have been seen to work well enough in the wild
-                    logger.warn("Your JVM is out of date. Please upgrade to the newest Oracle
Java 6.");
-            }
         }
-
+     */
         logger.info("Heap size: {}/{}", Runtime.getRuntime().totalMemory(), Runtime.getRuntime().maxMemory());
         logger.info("Classpath: {}", System.getProperty("java.class.path"));
         CLibrary.tryMlockall();


Mime
View raw message