svn commit: r743478 - /openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java

[awhite]

Author: awhite
Date: Wed Feb 11 20:15:56 2009
New Revision: 743478

URL: http://svn.apache.org/viewvc?rev=743478&view=rev
Log:
OPENJPA-913


Modified:
    
openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java

Modified: 
openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?rev=743478&r1=743477&r2=743478&view=diff
==============================================================================
--- 
openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
 (original)
+++ 
openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
 Wed Feb 11 20:15:56 2009
@@ -685,8 +685,15 @@
         int eventType) {
         if (_lifeEventManager == null)
             return false;
-        handleCallbackExceptions(_lifeEventManager.fireEvent(src, related, 
-            meta, eventType), _lifeCallbackMode);
+
+        lock();
+        Exception[] exs;
+        try {
+            exs = _lifeEventManager.fireEvent(src, related, meta, eventType);
+        } finally {
+            unlock();
+        } 
+        handleCallbackExceptions(exs, _lifeCallbackMode);
         return true;
     }