BGBM BDI Projects
/
cdmlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
cleanup
[cdmlib.git]
/
cdmlib-persistence
/
src
/
main
/
java
/
eu
/
etaxonomy
/
cdm
/
persistence
/
dao
/
hibernate
/
common
/
CdmEntityDaoBase.java
diff --git
a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
index 204a99d0c650349cb6f1312acc122ab5aafc983f..981e1f408930c5a5ed1e568f7f01d69b8f27658f 100644
(file)
--- a/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
+++ b/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
@@
-388,6
+388,7
@@
public abstract class CdmEntityDaoBase<T extends CdmBase>
return null;
}
+ // Ben Clark:
// Merge the object in if it is detached
//
// I think this is preferable to catching lazy initialization errors