hibernate tweaks

src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java

@@ -60,7 +60,7 @@ public class NextUnreadRedirectPage extends WebPage {
 			FeedEntryStatus status = Iterables.getFirst(statuses, null);
 			String url = status.getEntry().getUrl();
 			status.setRead(true);
-			feedEntryStatusDAO.update(status);
+			feedEntryStatusDAO.saveOrUpdate(status);
 			throw new RedirectToUrlException(url);
 		}
 	}

src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.java

@@ -63,7 +63,7 @@ public class PasswordRecoveryCallbackPage extends BasePage {
 					user.setApiKey(userService.generateApiKey(user));
 					user.setRecoverPasswordToken(null);
 					user.setRecoverPasswordTokenDate(null);
-					userDAO.update(user);
+					userDAO.saveOrUpdate(user);
 					info("Password saved.");
 				} else {
 					error("Passwords do not match.");

src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java

@@ -41,7 +41,7 @@ public class PasswordRecoveryPage extends BasePage {
 								.randomUUID().toString()));
 						user.setRecoverPasswordTokenDate(Calendar.getInstance()
 								.getTime());
-						userDAO.update(user);
+						userDAO.saveOrUpdate(user);
 						mailService.sendMail(user, "Password recovery",
 								buildEmailContent(user));
 						info("Email sent.");