You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/05/13 21:05:23 UTC
[2/3] git commit: updated refs/heads/master to 06c6b36
DAO: Rewrite change for method findByIdIncludingRemoved(ID id)
Also change the sibling method findById(final ID id)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/39aa0e4f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/39aa0e4f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/39aa0e4f
Branch: refs/heads/master
Commit: 39aa0e4f35259f1b4962f0469c82930a3fdac579
Parents: 696440a
Author: Marc-Aur�le Brothier <m...@brothier.org>
Authored: Mon May 9 11:39:04 2016 +0200
Committer: Marc-Aur�le Brothier <m...@brothier.org>
Committed: Fri May 13 11:01:39 2016 +0200
----------------------------------------------------------------------
.../src/com/cloud/utils/db/GenericDaoBase.java | 22 +++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/39aa0e4f/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
----------------------------------------------------------------------
diff --git a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
index 2de161b..f1b8d0d 100644
--- a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
+++ b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
@@ -942,12 +942,18 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
@DB()
@SuppressWarnings("unchecked")
public T findById(final ID id) {
+ T result = null;
if (_cache != null) {
final Element element = _cache.get(id);
- return element == null ? lockRow(id, null) : (T)element.getObjectValue();
+ if (element == null) {
+ result = lockRow(id, null);
+ } else {
+ result = (T)element.getObjectValue();
+ }
} else {
- return lockRow(id, null);
+ result = lockRow(id, null);
}
+ return result;
}
@Override
@@ -968,13 +974,19 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
@Override
@DB()
- public T findByIdIncludingRemoved(ID id) {
+ public T findByIdIncludingRemoved(final ID id) {
+ T result = null;
if (_cache != null) {
final Element element = _cache.get(id);
- return element == null ? findById(id, true, null) : (T)element.getObjectValue();
+ if (element == null) {
+ result = findById(id, true, null);
+ } else {
+ result = (T)element.getObjectValue();
+ }
} else {
- return findById(id, true, null);
+ result = findById(id, true, null);
}
+ return result;
}
@Override