Changeset 2215

Timestamp:

02/18/08 22:03:27 (9 months ago)

Author:

jmoore

Message:

OmeroBlitz : tickets

• #711 Also in OmeroPy
  
• #732 Added failling BOOST_ERROR call
  
• #843 Now catching HibernateObjectRetrievalFailureException
  

Location:

trunk/components

Files:

• server/src/ome/services/util/ServiceHandler.java (modified) (2 diffs)
• tools/OmeroCpp/test/boost_model.cpp (modified) (1 diff)
• tools/OmeroPy/test/integration/suite.py (modified) (1 diff)
• tools/OmeroPy/test/integration/tickets1000.py (added)

trunk/components/server/src/ome/services/util/ServiceHandler.java

@@ -34 +34 @@
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.dao.OptimisticLockingFailureException;
+import org.springframework.orm.hibernate3.HibernateObjectRetrievalFailureException;
 import org.springframework.orm.hibernate3.HibernateSystemException;
 
@@ -173 +174 @@
                 ve.setStackTrace(t.getStackTrace());
                 printException("DataIntegrityViolationException thrown.", t);
+                return ve;
+            }
+
+            else if (HibernateObjectRetrievalFailureException.class
+                    .isAssignableFrom(t.getClass())) {
+                ValidationException ve = new ValidationException(t.getMessage());
+                ve.setStackTrace(t.getStackTrace());
+                printException(
+                        "HibernateObjectRetrievealFailureException thrown.", t);
                 return ve;
             }

trunk/components/tools/OmeroCpp/test/boost_model.cpp

@@ -79 +79 @@
   BOOST_CHECK( !img->annotationLinksLoaded );
   img->annotationLinks.push_back((ImageAnnotationLinkPtr)0);
+  BOOST_ERROR("should not reach this point");
 }
 

trunk/components/tools/OmeroPy/test/integration/suite.py

@@ -29 +29 @@
     suite.addTest(load("test.integration.files"))
     suite.addTest(load("test.integration.ping"))
+    suite.addTest(load("test.integration.tickets1000"))
     return suite