[Firebird-checkins] SF.net SVN: firebird:[52989] firebird/trunk/src/yvalve/why.cpp

[<ale...@us...>]

Revision: 52989
          http://firebird.svn.sourceforge.net/firebird/?rev=52989&view=rev
Author:   alexpeshkoff
Date:     2011-05-23 11:45:48 +0000 (Mon, 23 May 2011)

Log Message:
-----------
Fixed isc_start_multiple() - thanks to Adriano

Modified Paths:
--------------
    firebird/trunk/src/yvalve/why.cpp

Modified: firebird/trunk/src/yvalve/why.cpp
===================================================================
--- firebird/trunk/src/yvalve/why.cpp	2011-05-23 11:45:09 UTC (rev 52988)
+++ firebird/trunk/src/yvalve/why.cpp	2011-05-23 11:45:48 UTC (rev 52989)
@@ -780,7 +780,7 @@
 		virtual void FB_CARG rollbackRetaining(IStatus* status);
 		virtual void FB_CARG disconnect(IStatus* status);
 		virtual ITransaction* FB_CARG join(IStatus* status, ITransaction* transaction);
-		virtual YTransaction* FB_CARG validate(IStatus* status, IAttachment* testAtt);
+		virtual ITransaction* FB_CARG validate(IStatus* status, IAttachment* testAtt);
 		virtual YTransaction* FB_CARG enterDtc(IStatus* status);
 
 		void addCleanupHandler(IStatus* status, CleanupCallback* callback);
@@ -3407,6 +3407,7 @@
 	StatusVector status(userStatus);
 	TEB* vector = (TEB*) vec;
 	ITransaction* multiTrans = NULL;
+	DtcStart* ds = NULL;
 
 	try
 	{
@@ -3415,23 +3416,35 @@
 		if (count <= 0 || !vector)
 			status_exception::raise(Arg::Gds(isc_bad_teb_form));
 
-		RefPtr<YAttachment> attachment(translateHandle(attachments, vector->teb_database));
-
 		if (count == 1)
 		{
+			RefPtr<YAttachment> attachment(translateHandle(attachments, vector->teb_database));
+
 			YTransaction* transaction = attachment->startTransaction(&status,
 				vector->teb_tpb_length, vector->teb_tpb);
 			*traHandle = transaction->handle;
 			return status[1];
 		}
 
-		// This works as long as TEB has same layout as DtcStart
-		DtcStart* ds = (DtcStart*) vec;
+		HalfStaticArray<DtcStart, 16> dtcStartBuffer;
+		DtcStart* ds = dtcStartBuffer.getBuffer(count);
+		memset(ds, 0, sizeof(DtcStart) * count);
+		DtcStart* p = ds;
+		DtcStart* const end = p + count;
+		for (; p < end; ++p, ++vector)
+		{
+			RefPtr<YAttachment> attachment(translateHandle(attachments, vector->teb_database));
+			p->attachment = attachment;
+			attachment->addRef();
+			p->tpbLength = vector->teb_tpb_length;
+			p->tpb = reinterpret_cast<const unsigned char*>(vector->teb_tpb);
+		}
+
 		multiTrans = DtcInterfacePtr()->start(&status, count, ds);
 
 		if (multiTrans)
 		{
-			YTransaction* transaction = new YTransaction(attachment, multiTrans);
+			YTransaction* transaction = new YTransaction(NULL, multiTrans);
 			*traHandle = transaction->handle;
 		}
 	}
@@ -3445,6 +3458,19 @@
 		e.stuffException(&status);
 	}
 
+	if (ds)
+	{
+		DtcStart* p = ds;
+		DtcStart* const end = p + count;
+		for (; p < end; ++p)
+		{
+			if (p->attachment)
+			{
+				p->attachment->release();
+			}
+		}
+	}
+
 	return status[1];
 }
 
@@ -4416,7 +4442,7 @@
 	return NULL;
 }
 
-YTransaction* FB_CARG YTransaction::validate(IStatus* status, IAttachment* testAtt)
+ITransaction* FB_CARG YTransaction::validate(IStatus* status, IAttachment* testAtt)
 {
 	try
 	{
@@ -4424,7 +4450,11 @@
 		selfCheck();
 
 		// Do not raise error in status - just return NULL if attachment does not match
-		return attachment == testAtt ? this : NULL;
+		if (attachment == testAtt)
+		{
+			return this;
+		}
+		return next->validate(status, testAtt);
 	}
 	catch (const Exception& ex)
 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.