up

kbengine · kbengine · commit c72a1aa965ab · 2014-08-18T15:11:36.000+08:00
diff --git a/kbe/src/lib/cstdkbe/objectpool.hpp b/kbe/src/lib/cstdkbe/objectpool.hpp
@@ -223,7 +223,7 @@ class ObjectPool
 		
 		while(!objs.empty())
 		{
-			T* t = objs.back();
+			T* t = objs.front();
 			objs.pop();
 			reclaimObject_(t);
 		}
diff --git a/kbe/src/lib/helper/debug_helper.cpp b/kbe/src/lib/helper/debug_helper.cpp
@@ -270,7 +270,7 @@ void DebugHelper::clearBufferedLog(bool destroy)
 	{
 		while(!bufferedLogPackets_.empty())
 		{
-			Mercury::Bundle* pBundle = bufferedLogPackets_.back();
+			Mercury::Bundle* pBundle = bufferedLogPackets_.front();
 			bufferedLogPackets_.pop();
 			delete pBundle;
 		}
@@ -341,7 +341,7 @@ void DebugHelper::sync()
 		if(i++ >= g_kbeSrvConfig.tickMaxSyncLogs() || totalLen > (PACKET_MAX_SIZE_TCP * 10))
 			break;
 		
-		Mercury::Bundle* pBundle = bufferedLogPackets_.back();
+		Mercury::Bundle* pBundle = bufferedLogPackets_.front();
 		bufferedLogPackets_.pop();
 
 		totalLen += pBundle->currMsgLength();

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ void DebugHelper::clearBufferedLog(bool destroy)`
`270`	`270`	`{`
`271`	`271`	`while(!bufferedLogPackets_.empty())`
`272`	`272`	`{`
`273`		`- Mercury::Bundle* pBundle = bufferedLogPackets_.back();`
	`273`	`+ Mercury::Bundle* pBundle = bufferedLogPackets_.front();`
`274`	`274`	`bufferedLogPackets_.pop();`
`275`	`275`	`delete pBundle;`
`276`	`276`	`}`
`@@ -341,7 +341,7 @@ void DebugHelper::sync()`
`341`	`341`	`if(i++ >= g_kbeSrvConfig.tickMaxSyncLogs() \|\| totalLen > (PACKET_MAX_SIZE_TCP * 10))`
`342`	`342`	`break;`
`343`	`343`
`344`		`- Mercury::Bundle* pBundle = bufferedLogPackets_.back();`
	`344`	`+ Mercury::Bundle* pBundle = bufferedLogPackets_.front();`
`345`	`345`	`bufferedLogPackets_.pop();`
`346`	`346`
`347`	`347`	`totalLen += pBundle->currMsgLength();`