db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r631335 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/reference/Property.java impl/services/jmx/JMXManagementService.java
Date Tue, 26 Feb 2008 18:52:04 GMT
Author: djd
Date: Tue Feb 26 10:52:00 2008
New Revision: 631335

URL: http://svn.apache.org/viewvc?rev=631335&view=rev
Log:
DERBY-3429 Remove system property derby.system.jmx and always have Derby attempt to register
MBeans. Allows for dynamic management.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java?rev=631335&r1=631334&r2=631335&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java Tue Feb
26 10:52:00 2008
@@ -885,12 +885,6 @@
 	// Define a static string for collation derivation NONE
 	public static final String COLLATION_NONE =
 		"NONE";
-        
-    /**
-     * derby.system.jmx
-     * enable or disable JMX
-     */    
-    public final static String JMX = "derby.system.jmx";
 
     /**
      * db2j.storage.dataNotSyncedAtCheckPoint

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java?rev=631335&r1=631334&r2=631335&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java
Tue Feb 26 10:52:00 2008
@@ -93,19 +93,17 @@
      * <LI> registering a Version mbean representing the system
      * </UL>
      */
-    public void boot(boolean create, Properties properties)
+    public synchronized void boot(boolean create, Properties properties)
             throws StandardException {
         
         registeredMbeans = new HashMap<ObjectName,StandardMBean>();
         
-        if (PropertyUtil.getSystemBoolean(Property.JMX)) {
-            findServer();
+        findServer();
              
-            myManagementBean = (ObjectName) registerMBean(this,
+        myManagementBean = (ObjectName) registerMBean(this,
                 ManagementMBean.class,
                 "type=Management");
-            myManagementServer = mbeanServer;
-        }
+        myManagementServer = mbeanServer;
         
         registerMBean(new Version(Monitor.getMonitor().getEngineVersion()),
                 VersionMBean.class,



Mime
View raw message