You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/03/11 18:37:04 UTC
svn commit: r516968 - in
/incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx:
JmxException.java JmxManagementService.java
instrument/InstrumentedComponent.java
Author: meerajk
Date: Sun Mar 11 10:37:03 2007
New Revision: 516968
URL: http://svn.apache.org/viewvc?view=rev&rev=516968
Log:
Made the code more defensive.
Modified:
incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
Modified: incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java?view=diff&rev=516968&r1=516967&r2=516968
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java (original)
+++ incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java Sun Mar 11 10:37:03 2007
@@ -36,4 +36,13 @@
super(cause);
}
+ /**
+ * Initializes the root cause.
+ * @param message Message for the exception.
+ * @param cause Initializes the root cause.
+ */
+ public JmxException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
}
Modified: incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java?view=diff&rev=516968&r1=516967&r2=516968
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java (original)
+++ incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java Sun Mar 11 10:37:03 2007
@@ -62,12 +62,13 @@
*/
public final void registerComponent(String name, Component component) throws JmxException {
- try {
+ try {
+ name = name.replace(":", "-");
ObjectName on = new ObjectName(managementDomain + ":" + "type=component,name=" + name);
InstrumentedComponent mbean = new InstrumentedComponent(component);
mBeanServer.registerMBean(mbean, on);
} catch (JMException ex) {
- throw new JmxException(ex);
+ throw new JmxException("Unable to register " + name, ex);
}
}
Modified: incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java?view=diff&rev=516968&r1=516967&r2=516968
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java (original)
+++ incubator/tuscany/java/sca/runtime/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java Sun Mar 11 10:37:03 2007
@@ -98,15 +98,18 @@
final MBeanConstructorInfo[] constructors = null;
final MBeanOperationInfo[] operations = null;
final MBeanNotificationInfo[] notifications = null;
-
- final MBeanAttributeInfo[] attributes = new MBeanAttributeInfo[properties.size()];
-
- int i = 0;
- for (PropertyValue<?> propertyValue : properties.values()) {
- attributes[i++] =
- new MBeanAttributeInfo(propertyValue.getName(), String.class.getName(), null, true, false, false);
+
+ int size = properties != null ? properties.size() : 0;
+ final MBeanAttributeInfo[] attributes = new MBeanAttributeInfo[size];
+
+ if(properties != null) {
+ int i = 0;
+ for (PropertyValue<?> propertyValue : properties.values()) {
+ attributes[i++] =
+ new MBeanAttributeInfo(propertyValue.getName(), String.class.getName(), null, true, false, false);
+ }
}
-
+
return new MBeanInfo(componentId.toString(), null, attributes, constructors, operations, notifications);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org