Continued:

- need to take StringUtils from commons-lang3 as contactCity might be NULL, too
- fixed copyright notice

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.java
index 44baf439e68db738e59a662a520cb9f67276e1b4..1fa405752cd3d0d893987d3dd3ed3335ac6f0962 100644 (file)
--- a/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.java
+++ b/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017, 2018 Free Software Foundation<roland@mxchange.org>
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/org/mxchange/jcontacts/model/contact/UserContact.java b/src/org/mxchange/jcontacts/model/contact/UserContact.java
index 3e35c35e1d7039dd4833984f6c55647e96373f4b..5ae62a9bb997da3578b350d2838fffc613011b2e 100644 (file)
--- a/src/org/mxchange/jcontacts/model/contact/UserContact.java
+++ b/src/org/mxchange/jcontacts/model/contact/UserContact.java
@@ -260,7 +260,7 @@ public class UserContact implements Contact {
                        // ... then ZIP code
                        SafeNumberUtils.compare(this.getContactZipCode(), contact.getContactZipCode()),
                        // ... and city
-                       this.getContactCity().compareTo(contact.getContactCity()),
+                       StringUtils.compare(this.getContactCity(), contact.getContactCity()),
                        // ... street name
                        StringUtils.compareIgnoreCase(this.getContactStreet(), contact.getContactStreet()),
                        // ... house number