Skip to content

Commit 15b6613

Browse files
authored
Merge pull request magento#1235 from makzef/1215-number-fromat-exception-empty-string
1215: fix parsing of plugin sort order value
2 parents f586f25 + bbb9fc6 commit 15b6613

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

src/com/magento/idea/magento2plugin/stubs/indexes/PluginIndex.java

+18-4
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,33 @@ private Set<PluginData> getPluginsForType(final XmlTag typeNode) {
9494

9595
for (final XmlTag pluginTag: typeNode.findSubTags(ModuleDiXml.PLUGIN_TAG_NAME)) {
9696
final String pluginType = pluginTag.getAttributeValue(ModuleDiXml.TYPE_ATTR);
97-
String pluginSortOrder = pluginTag.getAttributeValue(ModuleDiXml.SORT_ORDER_ATTR);
97+
final String pluginSortOrder = pluginTag.getAttributeValue(ModuleDiXml.SORT_ORDER_ATTR);
9898

9999
if (pluginType != null) {
100-
pluginSortOrder = pluginSortOrder == null ? "0" : pluginSortOrder;
101-
final PluginData pluginData = getPluginDataObject(pluginType, Integer.parseInt(pluginSortOrder));
100+
final PluginData pluginData = getPluginDataObject(pluginType, getIntegerOrZeroValue(pluginSortOrder));
102101
results.add(pluginData);
103102
}
104103
}
105104

106105
return results;
107106
}
108107

109-
private PluginData getPluginDataObject(final String pluginType, final Integer sortOrder) {
108+
private Integer getIntegerOrZeroValue(final String sortOrder) {
109+
if (sortOrder == null || sortOrder.isEmpty()) {
110+
return 0;
111+
}
112+
113+
try {
114+
return Integer.parseInt(sortOrder);
115+
} catch (NumberFormatException e) {
116+
return 0;
117+
}
118+
}
119+
120+
private PluginData getPluginDataObject(
121+
final String pluginType,
122+
final Integer sortOrder
123+
) {
110124
return new PluginData(pluginType, sortOrder);
111125
}
112126
};

0 commit comments

Comments
 (0)