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

fix NPE during compare #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix NPE during compare #16

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
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/jsieve/comparators/AsciiCasemap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public AsciiCasemap() {
* @see org.apache.jsieve.comparators.Equals#equals(String, String)
*/
public boolean equals(String string1, String string2) {
if (string1 == null && string2 == null) return true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have an indentation problem, this if is not at the same level than the other one.

We also tend to always use a block after a if.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think it would be possible to you to propose tests for this changeset?

Maybe we can write a AsciiCasemapTest class, and test :

  • null, null
  • "a", null
  • null, "a"
  • "a", "b"
  • "a", "a"
  • "a", "A"

if (string1 == null || string2 == null) return false;
return ComparatorUtils.equals(string1.toUpperCase(), string2
.toUpperCase());
}
Expand Down