Reduced number of FindBugs warnings

2 files changed, 4 insertions, 16 deletions

diff --git a/src/de/danoeh/antennapod/feed/EventDistributor.java b/src/de/danoeh/antennapod/feed/EventDistributor.java
index c538808e2..56333da52 100644
--- a/src/de/danoeh/antennapod/feed/EventDistributor.java
+++ b/src/de/danoeh/antennapod/feed/EventDistributor.java
@@ -39,7 +39,7 @@ public class EventDistributor extends Observable {
 		events = new ConcurrentLinkedQueue<Integer>();
 	}
 
-	public static EventDistributor getInstance() {
+	public static synchronized EventDistributor getInstance() {
 		if (instance == null) {
 			instance = new EventDistributor();
 		}
diff --git a/src/de/danoeh/antennapod/feed/Feed.java b/src/de/danoeh/antennapod/feed/Feed.java
index 445d4180d..032930f83 100644
--- a/src/de/danoeh/antennapod/feed/Feed.java
+++ b/src/de/danoeh/antennapod/feed/Feed.java
@@ -87,11 +87,7 @@ public class Feed extends FeedFile {
      */
     public Feed(String url, Date lastUpdate) {
         super(null, url, false);
-        if (lastUpdate != null) {
-            this.lastUpdate = lastUpdate;
-        } else {
-            this.lastUpdate = null;
-        }
+        this.lastUpdate = (lastUpdate != null) ? (Date) lastUpdate.clone() : null;
     }
 
     /**
@@ -323,19 +319,11 @@ public class Feed extends FeedFile {
     }
 
     public Date getLastUpdate() {
-        if (lastUpdate != null) {
-            return (Date) lastUpdate.clone();
-        } else {
-            return null;
-        }
+        return (lastUpdate != null) ? (Date) lastUpdate.clone() : null;
     }
 
     public void setLastUpdate(Date lastUpdate) {
-        if (lastUpdate != null) {
-            this.lastUpdate = (Date) lastUpdate.clone();
-        } else {
-            this.lastUpdate = null;
-        }
+        this.lastUpdate = (lastUpdate != null) ? (Date) lastUpdate.clone() : null;
     }
 
     public String getFeedIdentifier() {