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.

Sign up for GitHub

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

Jump to bottom

prevent exceptions with empty and- and or-qualifiers in ERXPrefixQualifierTraversal #675

Merged
merged 1 commit into from
Sep 8, 2015
Merged

prevent exceptions with empty and- and or-qualifiers in ERXPrefixQualifierTraversal #675

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions ...works/Core/ERExtensions/Sources/er/extensions/qualifiers/ERXPrefixQualifierTraversal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,27 @@ protected boolean traverseNotQualifier(EONotQualifier q) {

@Override
protected boolean traverseOrQualifier(EOOrQualifier q) {
NSRange range = new NSRange(_qualifiers.count() - q.qualifiers().count(), q.qualifiers().count());
ERXOrQualifier oq = new ERXOrQualifier(_qualifiers.subarrayWithRange(range));
_qualifiers.removeObjectsInRange(range);
_qualifiers.addObject(oq);
if (q.qualifiers().isEmpty()) {
_qualifiers.addObject(new ERXOrQualifier());
} else {
NSRange range = new NSRange(_qualifiers.count() - q.qualifiers().count(), q.qualifiers().count());
ERXOrQualifier oq = new ERXOrQualifier(_qualifiers.subarrayWithRange(range));
_qualifiers.removeObjectsInRange(range);
_qualifiers.addObject(oq);
}
return true;
}

@Override
protected boolean traverseAndQualifier(EOAndQualifier q) {
NSRange range = new NSRange(_qualifiers.count() - q.qualifiers().count(), q.qualifiers().count());
ERXAndQualifier aq = new ERXAndQualifier(_qualifiers.subarrayWithRange(range));
_qualifiers.removeObjectsInRange(range);
_qualifiers.addObject(aq);
if (q.qualifiers().isEmpty()) {
_qualifiers.addObject(new ERXAndQualifier());
} else {
NSRange range = new NSRange(_qualifiers.count() - q.qualifiers().count(), q.qualifiers().count());
ERXAndQualifier aq = new ERXAndQualifier(_qualifiers.subarrayWithRange(range));
_qualifiers.removeObjectsInRange(range);
_qualifiers.addObject(aq);
}
return true;
}

Expand Down