svn commit: r752437 - /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java

Author: gatfora
Date: Wed Mar 11 13:15:03 2009
New Revision: 752437

URL: http://svn.apache.org/viewvc?rev=752437&view=rev
Log:
Solve IllegalMonitorStateException problem as reported by Amila by only adding the bean to the list of locked beans if it really did get the lock. 

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java?rev=752437&r1=752436&r2=752437&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java Wed Mar 11 13:15:03 2009
@@ -50,7 +50,7 @@
 	
 	// Allow the deadlock timeout to be configured to help debug
 	static{
-		String deadlockProperty = (String) AccessController.doPrivileged(new PrivilegedAction<String>(){
+		String deadlockProperty = AccessController.doPrivileged(new PrivilegedAction<String>(){
 			public String run() {
 				return System.getProperty("deadlockTimeout");
 			}});
@@ -83,10 +83,7 @@
 	}
 
     public void commit() {
-        try {
-            releaseLocks();
-        } catch (RuntimeException e) {
-        }
+        releaseLocks();
         if (sentMessages && useSerialization) manager.getSender().wakeThread();
         active = false;
     }
@@ -156,7 +153,8 @@
 					}
 				}
 
-				enlistedBeans.add(bean);
+				if (locked)
+					enlistedBeans.add(bean);
 
 			}
 		}