You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by gw...@apache.org on 2014/10/20 21:03:58 UTC
svn commit: r1633201 -
/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java
Author: gwimmel
Date: Mon Oct 20 19:03:58 2014
New Revision: 1633201
URL: http://svn.apache.org/r1633201
Log:
[SYNCOPE-574] null-safe ConnConfProperty.compareTo()
Modified:
syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java?rev=1633201&r1=1633200&r2=1633201&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java Mon Oct 20 19:03:58 2014
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlElem
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.syncope.common.AbstractBaseBean;
@XmlRootElement
@@ -64,6 +65,6 @@ public class ConnConfProperty extends Ab
@Override
public int compareTo(final ConnConfProperty connConfProperty) {
- return this.getSchema().compareTo(connConfProperty.getSchema());
+ return ObjectUtils.compare(this.getSchema(), connConfProperty.getSchema());
}
}