Repository: openmeetings Updated Branches: refs/heads/master d75389c6c -> d66ffe773
no jira: sessionId should not be logged Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d66ffe77 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d66ffe77 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d66ffe77 Branch: refs/heads/master Commit: d66ffe7730faa4d1116458a3f5a2dfff3d80cc8c Parents: d75389c Author: Maxim Solodovnik <[email protected]> Authored: Thu Jun 15 23:02:54 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jun 15 23:03:19 2017 +0700 ---------------------------------------------------------------------- .../db/dao/server/SessiondataDao.java | 24 ++++++++++---------- .../openmeetings/util/ConnectionProperties.java | 5 ++-- .../openmeetings/webservice/UserWebService.java | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d66ffe77/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java index aba491d..a79be64 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java @@ -36,9 +36,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; /** - * + * * @author swagner This Class handles all session management - * + * */ @Transactional public class SessiondataDao { @@ -62,7 +62,7 @@ public class SessiondataDao { /** * creates a new session-object in the database - * + * * @param userId the id of the user to be set on this session * @param languageId language id to be set on this session * @return newly create {@link Sessiondata} @@ -73,7 +73,7 @@ public class SessiondataDao { /** * creates a new session-object in the database - * + * * @param userId the id of the user to be set on this session * @param roomId the id of the room to be set on this session * @param languageId language id to be set on this session @@ -89,7 +89,7 @@ public class SessiondataDao { } /** - * + * * @param SID * @return */ @@ -107,7 +107,7 @@ public class SessiondataDao { } /** - * + * * @param SID * @return */ @@ -123,7 +123,7 @@ public class SessiondataDao { /** * update the session of a user with a new user id this is needed to see if * the session is loggedin - * + * * @param SID * @param userId */ @@ -136,7 +136,7 @@ public class SessiondataDao { log.error("Could not find session to Update"); return false; } - log.debug("Found session to update: {}, userId: {}", sd.getSessionId(), userId); + log.debug("Found session to update: userId: {}", userId); sd.setUserId(userId); update(sd); @@ -155,7 +155,7 @@ public class SessiondataDao { log.error("Could not find session to Update"); return false; } - log.debug("Found session to update: {}, userId: {}", sd.getSessionId(), userId); + log.debug("Found session to update: userId: {}", userId); sd.setUserId(userId); update(sd); @@ -167,7 +167,7 @@ public class SessiondataDao { } /** - * + * * @param date * @return */ @@ -183,7 +183,7 @@ public class SessiondataDao { } /** - * + * * */ public void clearSessionTable(long timeout) { @@ -225,7 +225,7 @@ public class SessiondataDao { log.error("clearSessionByRoomId", err); } } - + public Sessiondata update(Sessiondata sd) { sd.setRefreshed(new Date()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d66ffe77/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java index cbf799e..9bdd639 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java @@ -77,10 +77,9 @@ public class ConnectionProperties implements Serializable { public void setDbType(DbType dbType) { this.dbType = dbType; } - + @Override public String toString() { - return "ConnectionProperties [type=" + dbType + ", driver=" + driver + ", url=" + url - + ", login=" + login + ", password=" + password + "]"; + return "ConnectionProperties [type=" + dbType + ", driver=" + driver + ", url=" + url + ", login=" + login + "]"; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d66ffe77/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java index de7c538..814f5d1 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java @@ -116,7 +116,7 @@ public class UserWebService implements UserService { } Sessiondata sd = sessionDao.create(u.getId(), u.getLanguageId()); - log.debug("Login user SID : " + sd.getSessionId()); + log.debug("Login user: {}", u.getId()); return new ServiceResult(u.getId(), sd.getSessionId(), Type.SUCCESS); } catch (OmException oe) { return new ServiceResult(oe.getCode() == null ? -1 : oe.getCode(), oe.getMessage(), Type.ERROR);
