Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detect factories having designate element with both "pid" and #3207

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -370,15 +370,16 @@ private Descriptor parseMetatype(InputStream is, String name) throws IOException
StartElement start = event.asStartElement();
String elementName = start.getName().getLocalPart();
if (elementName.equals("Designate")) {
Attribute pidAttribute = start.getAttributeByName(new QName("pid"));
// Felix SCR Generator incorrectly generates both attributes "factoryPid" and "pid" for factories
Attribute pidAttribute = start.getAttributeByName(new QName("factoryPid"));
if (pidAttribute != null) {
result.name = pidAttribute.getValue();
result.factory = true;
} else {
pidAttribute = start.getAttributeByName(new QName("factoryPid"));
pidAttribute = start.getAttributeByName(new QName("pid"));
if (pidAttribute != null) {
result.name = pidAttribute.getValue();
}
result.factory = true;
}
} else if (elementName.equals("AD")) {
String propName = start.getAttributeByName(new QName("id")).getValue();
Expand Down
Loading