You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/03/08 23:26:04 UTC
svn commit: r1298624 - in /cxf/trunk/rt/management/src:
main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
test/java/org/apache/cxf/management/InstrumentationManagerTest.java
Author: ay
Date: Thu Mar 8 22:26:04 2012
New Revision: 1298624
URL: http://svn.apache.org/viewvc?rev=1298624&view=rev
Log:
un-reverting the previous commit for CXF-4170 as it looks okay
Modified:
cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
Modified: cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java?rev=1298624&r1=1298623&r2=1298624&view=diff
==============================================================================
--- cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java (original)
+++ cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java Thu Mar 8 22:26:04 2012
@@ -389,17 +389,17 @@ public class InstrumentationManagerImpl
private void readJMXProperties(Bus b) {
if (b != null) {
- persistentBusId = getBusProperty(b, "bus.jmx.persistentBusId", null);
+ persistentBusId = getBusProperty(b, "bus.jmx.persistentBusId", persistentBusId);
mbeanServerName =
- getBusProperty(b, "bus.jmx.serverName", ManagementConstants.DEFAULT_DOMAIN_NAME);
+ getBusProperty(b, "bus.jmx.serverName", mbeanServerName);
usePlatformMBeanServer =
- Boolean.valueOf(getBusProperty(b, "bus.jmx.usePlatformMBeanServer", null));
+ getBusProperty(b, "bus.jmx.usePlatformMBeanServer", usePlatformMBeanServer);
createMBServerConnectorFactory =
- Boolean.valueOf(getBusProperty(b, "bus.jmx.createMBServerConnectorFactory", null));
- daemon = Boolean.valueOf(getBusProperty(b, "bus.jmx.daemon", null));
- threaded = Boolean.valueOf(getBusProperty(b, "bus.jmx.threaded", null));
- enabled = Boolean.valueOf(getBusProperty(b, "bus.jmx.enabled", null));
- jmxServiceURL = getBusProperty(b, "bus.jmx.JMXServiceURL", null);
+ getBusProperty(b, "bus.jmx.createMBServerConnectorFactory", createMBServerConnectorFactory);
+ daemon = getBusProperty(b, "bus.jmx.daemon", daemon);
+ threaded = getBusProperty(b, "bus.jmx.threaded", threaded);
+ enabled = getBusProperty(b, "bus.jmx.enabled", enabled);
+ jmxServiceURL = getBusProperty(b, "bus.jmx.JMXServiceURL", jmxServiceURL);
}
}
@@ -407,5 +407,10 @@ public class InstrumentationManagerImpl
String v = (String)b.getProperty(key);
return v != null ? v : dflt;
}
+
+ private static boolean getBusProperty(Bus b, String key, boolean dflt) {
+ String v = (String)b.getProperty(key);
+ return v != null ? Boolean.valueOf(v) : dflt;
+ }
}
Modified: cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java?rev=1298624&r1=1298623&r2=1298624&view=diff
==============================================================================
--- cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java (original)
+++ cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java Thu Mar 8 22:26:04 2012
@@ -64,7 +64,6 @@ public class InstrumentationManagerTest
assertNull("MBeanServer should not be available.", mbs);
}
- @org.junit.Ignore
@Test
public void testInstrumentationEnabledSetBeforeBusSet() {
SpringBusFactory factory = new SpringBusFactory();