Changeset 7582

Timestamp:

04/06/09 12:55:42 (17 months ago)

Author:

dragisak

Message:

Add checks to prevent loosing annotation body during conversion. Addresses #1108

Files:

• head/ambra/webapp/src/main/java/org/topazproject/ambra/annotation/service/AnnotationService.java (modified) (3 diffs)

head/ambra/webapp/src/main/java/org/topazproject/ambra/annotation/service/AnnotationService.java

@@ -37 +37 @@
 import org.springframework.transaction.annotation.Transactional;
 
+import org.topazproject.ambra.ApplicationException;
 import org.topazproject.ambra.Constants;
 import org.topazproject.ambra.annotation.FlagUtil;
@@ -600 +601 @@
     }
 
+    // Trying to catch #1108
+    if (srcAnnotation.getBody() == null)
+      throw new ApplicationException("Trying to copy annotation " + srcAnnotationId +
+          " that has NULL body");
+
     ArticleAnnotation newAn = newAnnotationClassType.newInstance();
     synchronized (beanUtils) {
@@ -608 +614 @@
     session.delete(srcAnnotation);
     session.flush();
+
+    // Trying to catch #1108
+    if (newAn.getBody() == null)
+      throw new ApplicationException("Trying to save annotation " + newAn.getId().toString()
+          + " with NULL body");
 
     return session.saveOrUpdate(newAn); // Should return value equal to srcAnnotationId