You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by sk...@apache.org on 2018/06/07 08:17:26 UTC
syncope git commit: [SYNCOPE-1295] Small fix
Repository: syncope
Updated Branches:
refs/heads/2_0_X ebe479e46 -> d9905b4a3
[SYNCOPE-1295] Small fix
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d9905b4a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d9905b4a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d9905b4a
Branch: refs/heads/2_0_X
Commit: d9905b4a34cd353eeb9057241f142a2cc9406780
Parents: ebe479e
Author: skylark17 <ma...@tirasa.net>
Authored: Thu Jun 7 10:16:52 2018 +0200
Committer: skylark17 <ma...@tirasa.net>
Committed: Thu Jun 7 10:17:09 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/syncope/core/logic/SCIMDataBinder.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d9905b4a/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/SCIMDataBinder.java
----------------------------------------------------------------------
diff --git a/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/SCIMDataBinder.java b/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/SCIMDataBinder.java
index 20cec64..0b0e656 100644
--- a/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/SCIMDataBinder.java
+++ b/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/SCIMDataBinder.java
@@ -559,9 +559,9 @@ public class SCIMDataBinder {
setAttribute(userTO, addressConf.getLocality(),
address.getLocality());
}
- if (addressConf.getRegion() != null && address.getFormatted() != null) {
- setAttribute(userTO, addressConf.getFormatted(),
- address.getFormatted());
+ if (addressConf.getRegion() != null && address.getRegion() != null) {
+ setAttribute(userTO, addressConf.getRegion(),
+ address.getRegion());
}
if (addressConf.getPostalCode() != null && address.getPostalCode() != null) {
setAttribute(userTO, addressConf.getPostalCode(),