From 542cb2e2e7af65a3054620862b60c9a7596685b5 Mon Sep 17 00:00:00 2001
From: Fredrik Friis <fred-fri@dsv.su.se>
Date: Thu, 1 Mar 2012 13:23:36 +0900
Subject: [PATCH] fixed some saves
---
.../peer/data/dao/controllers/PeerPortalControllerImpl.java | 2 +-
.../java/se/su/dsv/scipro/peer/panels/PeerRequestListPanel.java | 2 +-
.../su/dsv/scipro/peer/panels/StudentPeerInfoRequestsPanel.java | 2 +-
.../su/dsv/scipro/peer/workerthreads/ExpiredRequestWorker.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/peer/data/dao/controllers/PeerPortalControllerImpl.java b/src/main/java/se/su/dsv/scipro/peer/data/dao/controllers/PeerPortalControllerImpl.java
index fa8d0c1657..61d32628d8 100644
--- a/src/main/java/se/su/dsv/scipro/peer/data/dao/controllers/PeerPortalControllerImpl.java
+++ b/src/main/java/se/su/dsv/scipro/peer/data/dao/controllers/PeerPortalControllerImpl.java
@@ -246,7 +246,7 @@ public class PeerPortalControllerImpl implements PeerPortalController {
if (request.getStatus() != RequestStatus.WAITING) {
// reset status
request.setStatus(RequestStatus.WAITING);
- peerRequestDao.save(request);
+ request = peerRequestDao.save(request);
}
throw e;
}
diff --git a/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestListPanel.java b/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestListPanel.java
index 33c21a9f7f..0f973652af 100644
--- a/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestListPanel.java
+++ b/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestListPanel.java
@@ -93,7 +93,7 @@ public class PeerRequestListPanel extends Panel {
}else {
// Request has aborted review, set canceled in order to keep statistics
req.setStatus(RequestStatus.CANCELED);
- peerRequestDao.save(req);
+ req = peerRequestDao.save(req);
info("The request was canceled");
}
target.addComponent(PeerRequestListPanel.this);
diff --git a/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoRequestsPanel.java b/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoRequestsPanel.java
index a9bd0099d8..dbac3090e1 100644
--- a/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoRequestsPanel.java
+++ b/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoRequestsPanel.java
@@ -171,7 +171,7 @@ public abstract class StudentPeerInfoRequestsPanel extends Panel {
// Request has aborted review, set canceled in order to keep statistics
info("The request was canceled");
reloadedRequest.setStatus(RequestStatus.CANCELED);
- peerRequestDao.save(reloadedRequest);
+ reloadedRequest = peerRequestDao.save(reloadedRequest);
}
target.addComponent(StudentPeerInfoRequestsPanel.this);
}
diff --git a/src/main/java/se/su/dsv/scipro/peer/workerthreads/ExpiredRequestWorker.java b/src/main/java/se/su/dsv/scipro/peer/workerthreads/ExpiredRequestWorker.java
index 53a46fae77..d8a9877a78 100644
--- a/src/main/java/se/su/dsv/scipro/peer/workerthreads/ExpiredRequestWorker.java
+++ b/src/main/java/se/su/dsv/scipro/peer/workerthreads/ExpiredRequestWorker.java
@@ -40,7 +40,7 @@ public class ExpiredRequestWorker extends AbstractWorker {
} else {
// Request has aborted review, set canceled in order to keep statistics
request.setStatus(RequestStatus.CANCELED);
- peerRequestDao.save(request);
+ request = peerRequestDao.save(request);
}
}