[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.37,1.38

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/chaining
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6135/mockpp/chaining

Modified Files:
	AbstractDynamicChainingMock.h 
Log Message:
central exception handling

Index: AbstractDynamicChainingMock.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- AbstractDynamicChainingMock.h	27 Nov 2005 17:27:57 -0000	1.37
+++ AbstractDynamicChainingMock.h	3 Dec 2005 13:10:30 -0000	1.38
@@ -318,7 +318,7 @@
     virtual void mockInvocation( const I &invocation )
     {
       if ( this->failure.get() != 0 )
-        MOCKPP_THROW(*this->failure.get());
+        forwardMalfunctionData(*this->failure.get());
 
       MOCKPP_TRY
       {
@@ -333,7 +333,7 @@
                                                this->invocationDispatcher.get(),
                                                assertion.getMessage() );
         this->failure.reset( new AssertionFailedError(__LINE__, __FILE__, dme.getMessage()));
-        MOCKPP_THROW(*this->failure.get());
+        forwardMalfunctionData(*this->failure.get());
       }
 #endif // MOCKPP_NO_EXCEPTIONS
     }
@@ -380,7 +380,7 @@
   void mockInvocation( const I &invocation ) \
   { \
     if ( this->failure.get() != 0 ) \
-      MOCKPP_THROW(*this->failure.get()); \
+      forwardMalfunctionData(*this->failure.get()); \
   \
     try \
     { \
@@ -394,7 +394,7 @@
                                             this->invocationDispatcher.get(), \
                                             assertion.getMessage() ); \
       this->failure.reset( new AssertionFailedError(__LINE__, __FILE__, dme.getMessage())); \
-      MOCKPP_THROW(*this->failure.get()); \
+      forwardMalfunctionData(*this->failure.get()); \
     } \
   } \
 }; \