[rhmessaging-commits] rhmessaging commits: r1120 - store/trunk/cpp/lib.

[rhmessaging-commits at lists.jboss.org]

Author: cctrieloff
Date: 2007-10-19 13:58:47 -0400 (Fri, 19 Oct 2007)
New Revision: 1120

Modified:
   store/trunk/cpp/lib/BdbMessageStore.cpp
Log:
fixed memory leaks

Modified: store/trunk/cpp/lib/BdbMessageStore.cpp
===================================================================
--- store/trunk/cpp/lib/BdbMessageStore.cpp	2007-10-19 17:56:15 UTC (rev 1119)
+++ store/trunk/cpp/lib/BdbMessageStore.cpp	2007-10-19 17:58:47 UTC (rev 1120)
@@ -466,13 +466,12 @@
 
     				dtokp.reset();
 	    			dtokp.set_wstate(DataTokenImpl::ENQ);
+					::free(dbuff);
+					if (xidbuff)
+						::free(xidbuff);
                     break;
 		        }
                 case rhm::journal::RHM_IORES_AIO_WAIT:
-/*                    if (++aio_sleep_cnt > MAX_AIO_SLEEPS)
-                    {
-                        THROW_STORE_EXCEPTION("Store error, disk time out on recover for:" + queue->getName());
-                    }*/
                     ::usleep(AIO_SLEEP_TIME);
                     break;
                 case rhm::journal::RHM_IORES_EMPTY:
@@ -568,9 +567,6 @@
     std::set<string> prepared;
     collectPreparedXids(prepared);
 
-//std::cout << "prep size:" << prepared.size() << std::endl;
-
-
 	//when using the async journal, it will abort unprepaired xids and populate the locked maps
 	if (!usingJrnl()){
 	    txn_lock_map enqueues;
@@ -593,8 +589,6 @@
   	    }
 	} else {
   	    for (std::set<string>::iterator i = prepared.begin(); i != prepared.end(); i++) {
-
-//std::cout << "prep:" << *i << std::endl;
             LockedMappings::shared_ptr enq_ptr;
             enq_ptr.reset(new LockedMappings);
             LockedMappings::shared_ptr deq_ptr;