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/22 22:38:01 UTC
[1/2] git commit: [SYNCOPE-574] null-safe ConnConfProperty.compareTo()
Repository: syncope
Updated Branches:
refs/heads/master ebd1897c1 -> c118517c9
[SYNCOPE-574] null-safe ConnConfProperty.compareTo()
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4e29d42f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4e29d42f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4e29d42f
Branch: refs/heads/master
Commit: 4e29d42fd4d0f6b9dbc623527164b0d373216d53
Parents: ad6f31b
Author: Guido Wimmel <gw...@apache.org>
Authored: Wed Oct 22 21:52:50 2014 +0200
Committer: Guido Wimmel <gw...@apache.org>
Committed: Wed Oct 22 22:02:35 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/syncope/common/types/ConnConfProperty.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4e29d42f/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java b/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java
index ea8003c..cf343a6 100644
--- a/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java
+++ b/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlElement;
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 AbstractBaseBean implements Comparable<Con
@Override
public int compareTo(final ConnConfProperty connConfProperty) {
- return this.getSchema().compareTo(connConfProperty.getSchema());
+ return ObjectUtils.compare(this.getSchema(), connConfProperty.getSchema());
}
}
[2/2] git commit: Merge branch '1_2_X'
Posted by gw...@apache.org.
Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c118517c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c118517c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c118517c
Branch: refs/heads/master
Commit: c118517c98857a99ce2ac968acf2c9bff5158cb0
Parents: ebd1897 4e29d42
Author: Guido Wimmel <gw...@apache.org>
Authored: Wed Oct 22 22:24:07 2014 +0200
Committer: Guido Wimmel <gw...@apache.org>
Committed: Wed Oct 22 22:24:07 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/syncope/common/types/ConnConfProperty.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------