Merge branch 'release/5.0.0'

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / conversation / ConversationHolder.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/conversation/ConversationHolder.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/conversation/ConversationHolder.java
index 015e6c3ab5d70bac5cfbcb862910764170faafe6..2fe7ae07f3ae1c0d6f24cd00c80d580c0d5782a7 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/conversation/ConversationHolder.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/conversation/ConversationHolder.java
@@ -68,8 +68,7 @@ import eu.etaxonomy.cdm.persistence.hibernate.CdmPostDataChangeObservableListene
  * @see http://www.hibernate.org/42.html
  *
  * @author n.hoffmann,c.mathew
- * @created 12.03.2009
- * @version 1.0
+ * @since 12.03.2009
  */
 public class ConversationHolder {
 
@@ -273,26 +272,17 @@ public class ConversationHolder {
      * @return if there is a running transaction
      */
     public boolean isTransactionActive(){
-        return transactionStatus != null;
+        return transactionStatus != null && !transactionStatus.isCompleted();
     }
 
-    /* (non-Javadoc)
-     * @see org.hibernate.Session#evict(java.lang.Object object)
-     */
     public void evict(Object object){
         getSession().evict(object);
     }
 
-    /* (non-Javadoc)
-     * @see org.hibernate.Session#refresh(java.lang.Object object)
-     */
     public void refresh(Object object){
         getSession().refresh(object);
     }
 
-    /* (non-Javadoc)
-     * @see org.hibernate.Session#clear()
-     */
     public void clear(){
         getSession().clear();
     }