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 2015/03/09 16:52:21 UTC
[1/2] syncope git commit: [SYNCOPE-651] SyncopeUser:checkToken()
should fail if token is not set on user
Repository: syncope
Updated Branches:
refs/heads/1_2_X 2465f1317 -> 7b2bb2df7
[SYNCOPE-651] SyncopeUser:checkToken() should fail if token is not set on user
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3621adf4
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3621adf4
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3621adf4
Branch: refs/heads/1_2_X
Commit: 3621adf44e6c76a4faefb9782f77d90a1707ac1e
Parents: 8c38a41
Author: Guido Wimmel <gw...@apache.org>
Authored: Mon Mar 9 13:42:18 2015 +0100
Committer: Guido Wimmel <gw...@apache.org>
Committed: Mon Mar 9 13:42:18 2015 +0100
----------------------------------------------------------------------
.../apache/syncope/core/persistence/beans/user/SyncopeUser.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3621adf4/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java b/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
index 2bf72ac..c03ab31 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
@@ -427,7 +427,9 @@ public class SyncopeUser extends AbstractAttributable {
}
public boolean checkToken(final String token) {
- return this.token == null || this.token.equals(token) && !hasTokenExpired();
+ return this.token == null
+ ? token == null
+ : this.token.equals(token) && !hasTokenExpired();
}
public boolean hasTokenExpired() {
[2/2] syncope git commit: Merge branch '1_1_X' into 1_2_X
Posted by gw...@apache.org.
Merge branch '1_1_X' into 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/7b2bb2df
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7b2bb2df
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7b2bb2df
Branch: refs/heads/1_2_X
Commit: 7b2bb2df74256fa7a72fa640c27377dd3452d849
Parents: 2465f13 3621adf
Author: Guido Wimmel <gw...@apache.org>
Authored: Mon Mar 9 16:41:35 2015 +0100
Committer: Guido Wimmel <gw...@apache.org>
Committed: Mon Mar 9 16:41:35 2015 +0100
----------------------------------------------------------------------
.../apache/syncope/core/persistence/beans/user/SyncopeUser.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/7b2bb2df/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
----------------------------------------------------------------------