hibernate tweaks

src/main/java/com/commafeed/backend/services/FeedEntryService.java

@@ -17,7 +17,7 @@ public class FeedEntryService {
 		FeedEntryStatus status = feedEntryStatusDAO.findById(user, entryId);
 		if (status != null) {
 			status.setRead(read);
-			feedEntryStatusDAO.update(status);
+			feedEntryStatusDAO.saveOrUpdate(status);
 		}
 	}
 
@@ -25,7 +25,7 @@ public class FeedEntryService {
 		FeedEntryStatus status = feedEntryStatusDAO.findById(user, entryId);
 		if (status != null) {
 			status.setStarred(starred);
-			feedEntryStatusDAO.update(status);
+			feedEntryStatusDAO.saveOrUpdate(status);
 		}
 	}
 }

src/main/java/com/commafeed/backend/services/FeedService.java

@@ -23,7 +23,7 @@ public class FeedService {
 			feed = new Feed();
 			feed.setUrl(url);
 			feed.setUrlHash(DigestUtils.sha1Hex(url));
-			feedDAO.save(feed);
+			feedDAO.saveOrUpdate(feed);
 		}
 		return feed;
 	}

src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java

@@ -86,7 +86,7 @@ public class FeedSubscriptionService {
 				status.setSubscription(sub);
 				statuses.add(status);
 			}
-			feedEntryStatusDAO.save(statuses);
+			feedEntryStatusDAO.saveOrUpdate(statuses);
 		}
 		taskGiver.add(feed);
 		return feed;

src/main/java/com/commafeed/backend/services/UserService.java

@@ -56,7 +56,7 @@ public class UserService {
 					user.getPassword(), user.getSalt());
 			if (authenticated) {
 				user.setLastLogin(Calendar.getInstance().getTime());
-				userDAO.update(user);
+				userDAO.saveOrUpdate(user);
 				return user;
 			}
 		}
@@ -85,7 +85,7 @@ public class UserService {
 		for (Role role : roles) {
 			user.getRoles().add(new UserRole(user, role));
 		}
-		userDAO.save(user);
+		userDAO.saveOrUpdate(user);
 		return user;
 	}