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:03:27 UTC
svn commit: r1298608 - 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:03:27 2012
New Revision: 1298608
URL: http://svn.apache.org/viewvc?rev=1298608&view=rev
Log:
something went wrong with CXF-4170 fix; temporarily reverting it
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=1298608&r1=1298607&r2=1298608&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:03:27 2012
@@ -389,17 +389,17 @@ public class InstrumentationManagerImpl
private void readJMXProperties(Bus b) {
if (b != null) {
- persistentBusId = getBusProperty(b, "bus.jmx.persistentBusId", persistentBusId);
+ persistentBusId = getBusProperty(b, "bus.jmx.persistentBusId", null);
mbeanServerName =
- getBusProperty(b, "bus.jmx.serverName", mbeanServerName);
+ getBusProperty(b, "bus.jmx.serverName", ManagementConstants.DEFAULT_DOMAIN_NAME);
usePlatformMBeanServer =
- getBusProperty(b, "bus.jmx.usePlatformMBeanServer", usePlatformMBeanServer);
+ Boolean.valueOf(getBusProperty(b, "bus.jmx.usePlatformMBeanServer", null));
createMBServerConnectorFactory =
- 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);
+ 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);
}
}
@@ -407,10 +407,5 @@ 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=1298608&r1=1298607&r2=1298608&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:03:27 2012
@@ -64,6 +64,7 @@ public class InstrumentationManagerTest
assertNull("MBeanServer should not be available.", mbs);
}
+ @org.junit.Ignore
@Test
public void testInstrumentationEnabledSetBeforeBusSet() {
SpringBusFactory factory = new SpringBusFactory();