This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 0edeaa0658 Revert after Mark review
0edeaa0658 is described below
commit 0edeaa06581e56c20b458b40f80ca623ef38f3a5
Author: remm <[email protected]>
AuthorDate: Wed Jun 10 20:18:20 2026 +0200
Revert after Mark review
---
.../catalina/ant/jmx/JMXAccessorConditionBase.java | 3 +--
java/org/apache/catalina/ant/jmx/JMXAccessorTask.java | 18 +++++++++---------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
index 7f64bbc81b..e114f25439 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
@@ -22,7 +22,6 @@ import java.net.MalformedURLException;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.ProjectComponent;
import org.apache.tools.ant.taskdefs.condition.Condition;
@@ -234,7 +233,7 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
return result.toString();
}
} catch (Exception e) {
- throw new BuildException("Cannot access JMX value for condition",
e);
+ // ignore access or connection open errors
}
return null;
}
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index d9d2d1cd67..8c38ab0bf6 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -22,6 +22,7 @@ import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.UnknownHostException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -684,16 +685,15 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
}
}
} else if (result instanceof TabularDataSupport data) {
- for (Object rowObj : data.values()) {
- CompositeData row = (CompositeData) rowObj;
- CompositeType rowType = row.getCompositeType();
- for (String fieldName : rowType.keySet()) {
- Object fieldValue = row.get(fieldName);
- OpenType<?> fieldType = rowType.getType(fieldName);
- if (fieldType instanceof SimpleType<?>) {
- setProperty(propertyPrefix + "." + fieldName,
fieldValue);
+ for (Object key : data.keySet()) {
+ for (Object key1 : ((List<?>) key)) {
+ CompositeData valuedata = data.get(new Object[] { key1 });
+ Object value = valuedata.get("value");
+ OpenType<?> type =
valuedata.getCompositeType().getType("value");
+ if (type instanceof SimpleType<?>) {
+ setProperty(propertyPrefix + "." + key1, value);
} else {
- createProperty(propertyPrefix + "." + fieldName,
fieldValue);
+ createProperty(propertyPrefix + "." + key1, value);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
