From 8cf56297c6c4bd6f0b56899a9452be50cd28df1d Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Thu, 25 Oct 2012 12:47:23 +0200
Subject: [PATCH] Fixed some issues found by FindBugs plugin
---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 4 ++--
src/main/java/de/thm/arsnova/entities/User.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 4eb971a99..d44832092 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -109,7 +109,7 @@ public class CouchDBDao implements IDatabaseDao {
*/
@Override
public void cleanFeedbackVotes(int cleanupFeedbackDelay) {
- final long timelimitInMillis = 60000 * cleanupFeedbackDelay;
+ final long timelimitInMillis = 60000 * (long) cleanupFeedbackDelay;
final long maxAllowedTimeInMillis = System.currentTimeMillis() - timelimitInMillis;
Map<String, Set<String>> affectedUsers = new HashMap<String, Set<String>>();
@@ -535,7 +535,7 @@ public class CouchDBDao implements IDatabaseDao {
JSONObject json = JSONObject.fromObject(loggedIn);
Document doc = new Document(json);
- if (doc.getId() == "") {
+ if (doc.getId().isEmpty()) {
// If this is a new user without a logged_in document, we have to remove the following
// pre-filled fields. Otherwise, CouchDB will take these empty fields as genuine
// identifiers, and will throw errors afterwards.
diff --git a/src/main/java/de/thm/arsnova/entities/User.java b/src/main/java/de/thm/arsnova/entities/User.java
index 997b22078..542dd4fbb 100644
--- a/src/main/java/de/thm/arsnova/entities/User.java
+++ b/src/main/java/de/thm/arsnova/entities/User.java
@@ -56,6 +56,7 @@ public class User implements Serializable {
@Override
public boolean equals(Object obj) {
+ if (obj == null || ! obj.getClass().equals(this.getClass())) return false;
User other = (User) obj;
return this.username.equals(other.username);
}
--
GitLab