JMC-5639: Can't resolve event type names without Recording Settings event
Ken Dobson
kdobson at redhat.com
Tue Sep 18 21:07:40 UTC 2018
Hi all,
This is a pretty simple fix for
https://bugs.openjdk.java.net/projects/JMC/issues/JMC-5663 if someone could
please review it that would be great.
diff -r 49f6575169ce
core/org.openjdk.jmc.flightrecorder.rules/src/main/java/org/openjdk/jmc/flightrecorder/rules/util/RulesToolkit.java
---
a/core/org.openjdk.jmc.flightrecorder.rules/src/main/java/org/openjdk/jmc/flightrecorder/rules/util/RulesToolkit.java
Tue Jul 31 20:02:30 2018 +0200
+++
b/core/org.openjdk.jmc.flightrecorder.rules/src/main/java/org/openjdk/jmc/flightrecorder/rules/util/RulesToolkit.java
Wed Sep 12 16:11:17 2018 -0400
@@ -952,12 +952,16 @@
private static String getEventTypeNames(IItemCollection items) {
Set<String> names = items.getAggregate(Aggregators.distinct("",
TYPE_NAME_ACCESSOR_FACTORY)); //$NON-NLS-1$
- if (names == null) {
- return null;
+ List<String> quotedNames = new ArrayList<>();
+ if (names == null || names.isEmpty()) {
+ for(IItemIterable iter : items){
+ quotedNames.add("'" + iter.getType().getIdentifier() +
"'");
+ }
}
- List<String> quotedNames = new ArrayList<>();
- for (String name : names) {
- quotedNames.add("'" + name + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+ else {
+ for (String name : names) {
+ quotedNames.add("'" + name + "'"); //$NON-NLS-1$
//$NON-NLS-2$
+ }
}
Collections.sort(quotedNames);
return StringToolkit.join(quotedNames, ", "); //$NON-NLS-1$
Thanks,
Ken
More information about the jmc-dev
mailing list