activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1382258 - in /activemq/trunk/activemq-console: ./ src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
Date Sat, 08 Sep 2012 09:13:42 GMT
Author: davsclaus
Date: Sat Sep  8 09:13:41 2012
New Revision: 1382258

URL: http://svn.apache.org/viewvc?rev=1382258&view=rev
Log:
AMQ-4027: Added support for Java7 in activemq-console. Thanks to Dider Gutacker for the patch.

Modified:
    activemq/trunk/activemq-console/   (props changed)
    activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java

Propchange: activemq/trunk/activemq-console/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Sep  8 09:13:41 2012
@@ -6,3 +6,5 @@ target
 .settings
 eclipse-classes
 .checkstyle
+velocity.log
+.idea

Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java?rev=1382258&r1=1382257&r2=1382258&view=diff
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
(original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
Sat Sep  8 09:13:41 2012
@@ -64,7 +64,8 @@ public abstract class AbstractJmxCommand
     }
 
     public static boolean isSunJVM() {
-        return getJVM().equals("Sun Microsystems Inc.");
+        // need to check for Oracle as that is the name for Java7 onwards.
+        return getJVM().equals("Sun Microsystems Inc.") || getJVM().startsWith("Oracle");
     }
 
     /**



Mime
View raw message