Skip to content

Commit

Permalink
* Changed build script for Windows to always produce both debug
Browse files Browse the repository at this point in the history
  and release output, so as to make it standard tool to generate
  a framework installation
* Added installation of MSSQL ODBC driver to setup shell script
  for Linux Ubuntu, plus small improvements
* Striped the framework solution out of sample applications, which
  were moved to their own repositories in Github
* Fixed bug in initialization that would lead to stack corruption
  whenever the loading/parsing of configuration failed
* Replaced POCO XML parser in configuration module by RAPIDXML to
  speed up initialization of framework, main in UWP apps
* Added capability of loading error info from an HMODULE in
  WWAPI::AppendDwordErrorMessage
* Improved error handler for task chains un UWP apps
* Corrected UWP XAML report helper: no longer displaying stack
  trace of caught exception
* SQLite source updated to v3.21.0
  • Loading branch information
faburaya committed Jan 6, 2018
1 parent 694a4b4 commit 233fc10
Show file tree
Hide file tree
Showing 186 changed files with 28,819 additions and 33,782 deletions.
83 changes: 1 addition & 82 deletions 3FD.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 14 for Windows Desktop
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3FD", "3FD\3FD.vcxproj", "{CCC4A0A2-15FD-4A6E-AC6C-094AAAAEC80B}"
Expand All @@ -26,14 +26,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestRpcClient", "TestRpcCli
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWwsClient", "TestWwsClient\TestWwsClient.vcxproj", "{4913E097-136E-4BC4-BF8C-D3341FB1425A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoTranscoder", "VideoTranscoder\VideoTranscoder.vcxproj", "{84D2D4D4-0A88-477D-B645-C972EEB97464}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Real Applications", "Real Applications", "{81644728-0859-4738-A153-9130F614BE9F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageTranscoder", "ImageTranscoder\ImageTranscoder.vcxproj", "{78B91DF7-B30D-4479-BEBC-795C8617DC55}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MyImagingComsWinRT", "ImageTranscoder\MyImagingComsWinRT.vcxproj", "{EF5FD437-8033-4645-9977-D07323283556}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3FD.WinRT.UWP", "3FD\3FD.WinRT.UWP.vcxproj", "{793AC4E5-04FF-43C1-89F9-6D7212264A36}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest.WinRT.UWP", "gtest\WinRT.UWP\gtest.WinRT.UWP.vcxproj", "{B650C884-6640-4FEE-9C5B-62E4D84D9E0F}"
Expand All @@ -42,8 +34,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTestsApp.WinRT.UWP", "U
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IntegrationTestsApp.WinRT.UWP", "IntegrationTests\WinRT.UWP\IntegrationTestsApp.WinRT.UWP.vcxproj", "{C427C362-4B09-4C3F-8578-F58521328DF0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageTranscoderApp", "ImageTranscoderApp\ImageTranscoderApp.vcxproj", "{A751BAC6-864F-4500-B261-B88A465C7F89}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_XP|ARM = Debug_XP|ARM
Expand Down Expand Up @@ -180,52 +170,6 @@ Global
{4913E097-136E-4BC4-BF8C-D3341FB1425A}.Release|x64.Build.0 = Release|x64
{4913E097-136E-4BC4-BF8C-D3341FB1425A}.Release|x86.ActiveCfg = Release|Win32
{4913E097-136E-4BC4-BF8C-D3341FB1425A}.Release|x86.Build.0 = Release|Win32
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Debug_XP|ARM.ActiveCfg = Release|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Debug_XP|x64.ActiveCfg = Release|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Debug_XP|x86.ActiveCfg = Release|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Debug|ARM.ActiveCfg = Debug|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Debug|x64.ActiveCfg = Debug|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Debug|x64.Build.0 = Debug|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Debug|x86.ActiveCfg = Debug|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Release_XP|ARM.ActiveCfg = Release|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Release_XP|x64.ActiveCfg = Release|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Release_XP|x86.ActiveCfg = Release|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Release|ARM.ActiveCfg = Release|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Release|x64.ActiveCfg = Release|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Release|x64.Build.0 = Release|x64
{84D2D4D4-0A88-477D-B645-C972EEB97464}.Release|x86.ActiveCfg = Release|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Debug_XP|ARM.ActiveCfg = Release|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Debug_XP|x64.ActiveCfg = Release|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Debug_XP|x86.ActiveCfg = Release|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Debug|ARM.ActiveCfg = Debug|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Debug|x64.ActiveCfg = Debug|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Debug|x64.Build.0 = Debug|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Debug|x86.ActiveCfg = Debug|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Release_XP|ARM.ActiveCfg = Release|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Release_XP|x64.ActiveCfg = Release|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Release_XP|x86.ActiveCfg = Release|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Release|ARM.ActiveCfg = Release|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Release|x64.ActiveCfg = Release|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Release|x64.Build.0 = Release|x64
{78B91DF7-B30D-4479-BEBC-795C8617DC55}.Release|x86.ActiveCfg = Release|x64
{EF5FD437-8033-4645-9977-D07323283556}.Debug_XP|ARM.ActiveCfg = Debug|ARM
{EF5FD437-8033-4645-9977-D07323283556}.Debug_XP|x64.ActiveCfg = Debug|x64
{EF5FD437-8033-4645-9977-D07323283556}.Debug_XP|x86.ActiveCfg = Debug|Win32
{EF5FD437-8033-4645-9977-D07323283556}.Debug|ARM.ActiveCfg = Debug|ARM
{EF5FD437-8033-4645-9977-D07323283556}.Debug|ARM.Build.0 = Debug|ARM
{EF5FD437-8033-4645-9977-D07323283556}.Debug|x64.ActiveCfg = Debug|x64
{EF5FD437-8033-4645-9977-D07323283556}.Debug|x64.Build.0 = Debug|x64
{EF5FD437-8033-4645-9977-D07323283556}.Debug|x86.ActiveCfg = Debug|Win32
{EF5FD437-8033-4645-9977-D07323283556}.Debug|x86.Build.0 = Debug|Win32
{EF5FD437-8033-4645-9977-D07323283556}.Release_XP|ARM.ActiveCfg = Release|ARM
{EF5FD437-8033-4645-9977-D07323283556}.Release_XP|x64.ActiveCfg = Release|x64
{EF5FD437-8033-4645-9977-D07323283556}.Release_XP|x86.ActiveCfg = Release|Win32
{EF5FD437-8033-4645-9977-D07323283556}.Release|ARM.ActiveCfg = Release|ARM
{EF5FD437-8033-4645-9977-D07323283556}.Release|ARM.Build.0 = Release|ARM
{EF5FD437-8033-4645-9977-D07323283556}.Release|x64.ActiveCfg = Release|x64
{EF5FD437-8033-4645-9977-D07323283556}.Release|x64.Build.0 = Release|x64
{EF5FD437-8033-4645-9977-D07323283556}.Release|x86.ActiveCfg = Release|Win32
{EF5FD437-8033-4645-9977-D07323283556}.Release|x86.Build.0 = Release|Win32
{793AC4E5-04FF-43C1-89F9-6D7212264A36}.Debug_XP|ARM.ActiveCfg = Debug|ARM
{793AC4E5-04FF-43C1-89F9-6D7212264A36}.Debug_XP|x64.ActiveCfg = Debug|x64
{793AC4E5-04FF-43C1-89F9-6D7212264A36}.Debug_XP|x86.ActiveCfg = Debug|Win32
Expand Down Expand Up @@ -304,27 +248,6 @@ Global
{C427C362-4B09-4C3F-8578-F58521328DF0}.Release|x64.Deploy.0 = Release|x64
{C427C362-4B09-4C3F-8578-F58521328DF0}.Release|x86.ActiveCfg = Release|Win32
{C427C362-4B09-4C3F-8578-F58521328DF0}.Release|x86.Build.0 = Release|Win32
{A751BAC6-864F-4500-B261-B88A465C7F89}.Debug_XP|ARM.ActiveCfg = Debug|ARM
{A751BAC6-864F-4500-B261-B88A465C7F89}.Debug_XP|x64.ActiveCfg = Debug|x64
{A751BAC6-864F-4500-B261-B88A465C7F89}.Debug_XP|x86.ActiveCfg = Debug|Win32
{A751BAC6-864F-4500-B261-B88A465C7F89}.Debug|ARM.ActiveCfg = Debug|ARM
{A751BAC6-864F-4500-B261-B88A465C7F89}.Debug|ARM.Build.0 = Debug|ARM
{A751BAC6-864F-4500-B261-B88A465C7F89}.Debug|ARM.Deploy.0 = Debug|ARM
{A751BAC6-864F-4500-B261-B88A465C7F89}.Debug|x64.ActiveCfg = Debug|x64
{A751BAC6-864F-4500-B261-B88A465C7F89}.Debug|x64.Build.0 = Debug|x64
{A751BAC6-864F-4500-B261-B88A465C7F89}.Debug|x86.ActiveCfg = Debug|Win32
{A751BAC6-864F-4500-B261-B88A465C7F89}.Debug|x86.Build.0 = Debug|Win32
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release_XP|ARM.ActiveCfg = Release|ARM
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release_XP|x64.ActiveCfg = Release|x64
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release_XP|x86.ActiveCfg = Release|Win32
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release|ARM.ActiveCfg = Release|ARM
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release|ARM.Build.0 = Release|ARM
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release|ARM.Deploy.0 = Release|ARM
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release|x64.ActiveCfg = Release|x64
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release|x64.Build.0 = Release|x64
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release|x64.Deploy.0 = Release|x64
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release|x86.ActiveCfg = Release|Win32
{A751BAC6-864F-4500-B261-B88A465C7F89}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -336,13 +259,9 @@ Global
{EE86AB66-09DF-45EB-A42A-ED426AF3266E} = {8E00B911-43B2-49D5-9B4A-AB6E1ED097A1}
{6ADF3A4B-1E22-41BA-9293-96593E6A45BE} = {8E00B911-43B2-49D5-9B4A-AB6E1ED097A1}
{4913E097-136E-4BC4-BF8C-D3341FB1425A} = {8E00B911-43B2-49D5-9B4A-AB6E1ED097A1}
{84D2D4D4-0A88-477D-B645-C972EEB97464} = {81644728-0859-4738-A153-9130F614BE9F}
{78B91DF7-B30D-4479-BEBC-795C8617DC55} = {81644728-0859-4738-A153-9130F614BE9F}
{EF5FD437-8033-4645-9977-D07323283556} = {81644728-0859-4738-A153-9130F614BE9F}
{B650C884-6640-4FEE-9C5B-62E4D84D9E0F} = {EE86AB66-09DF-45EB-A42A-ED426AF3266E}
{AD508BAA-0192-4EDB-B1F5-23DC9CC2EC0C} = {EE86AB66-09DF-45EB-A42A-ED426AF3266E}
{C427C362-4B09-4C3F-8578-F58521328DF0} = {EE86AB66-09DF-45EB-A42A-ED426AF3266E}
{A751BAC6-864F-4500-B261-B88A465C7F89} = {81644728-0859-4738-A153-9130F614BE9F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
VisualSVNWorkingCopyRoot = .
Expand Down
1 change: 1 addition & 0 deletions 3FD/3FD.WinRT.UWP.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<ClInclude Include="sqlite.h" />
<ClInclude Include="sqlite3.h" />
<ClInclude Include="utils.h" />
<ClInclude Include="utils_algorithms.h" />
<ClInclude Include="utils_io.h" />
<ClInclude Include="utils_lockfreequeue.h" />
<ClInclude Include="stdafx.h" />
Expand Down
3 changes: 3 additions & 0 deletions 3FD/3FD.WinRT.UWP.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,8 @@
<ClInclude Include="utils_io.h">
<Filter>utilities</Filter>
</ClInclude>
<ClInclude Include="utils_algorithms.h">
<Filter>utilities</Filter>
</ClInclude>
</ItemGroup>
</Project>
8 changes: 8 additions & 0 deletions 3FD/3FD.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)\..\btree;$(ProjectDir)\..\OpenCL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/D POCO_STATIC %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4267</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -193,6 +194,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)\..\btree;$(ProjectDir)\..\OpenCL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/D POCO_STATIC %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4267</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -212,6 +214,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)\..\btree;$(ProjectDir)\..\OpenCL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/D POCO_STATIC %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4267</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -231,6 +234,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)\..\btree;$(ProjectDir)\..\OpenCL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/D POCO_STATIC %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4267</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -253,6 +257,7 @@
<AdditionalOptions>/D POCO_STATIC $(MSVC_X64_RELEASE_EINSTSET) %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4267</DisableSpecificWarnings>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -277,6 +282,7 @@
<AdditionalOptions>/D POCO_STATIC $(MSVC_X64_RELEASE_EINSTSET) %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4267</DisableSpecificWarnings>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -301,6 +307,7 @@
<AdditionalOptions>/D POCO_STATIC $(MSVC_X86_RELEASE_EINSTSET) %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4267</DisableSpecificWarnings>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -325,6 +332,7 @@
<AdditionalOptions>/D POCO_STATIC $(MSVC_X86_RELEASE_EINSTSET) %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4267</DisableSpecificWarnings>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down
26 changes: 13 additions & 13 deletions 3FD/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@

namespace _3fd
{
////////////////////////////////
// Utility Base Classes
////////////////////////////////
////////////////////////////////
// Utility Base Classes
////////////////////////////////

/// <summary>
/// If a class derives NotCopiable, it cannot be copied.
/// If you try to do that, an error is reported during the compilation.
/// </summary>
class NotCopiable
{
private:
/// <summary>
/// If a class derives NotCopiable, it cannot be copied.
/// If you try to do that, an error is reported during the compilation.
/// </summary>
class NotCopiable
{
private:

NotCopiable(const NotCopiable &) {}

public:
public:

NotCopiable() {}
};
};

# define notcopiable public ::_3fd::NotCopiable
# define notcopiable public ::_3fd::NotCopiable
}

#endif // end of header guard
50 changes: 25 additions & 25 deletions 3FD/broker_impl_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ namespace broker
end;
if not exists (
select * from sys.systypes
where name = N'%s/v1_0_0/Message/ContentType'
select * from sys.systypes
where name = N'%s/v1_0_0/Message/ContentType'
)
begin
create type [%s/v1_0_0/Message/ContentType] from varchar(%u);
create type [%s/v1_0_0/Message/ContentType] from varchar(%u);
end;
)"
, serviceURL
Expand Down Expand Up @@ -80,7 +80,7 @@ namespace broker
CheckConnection(*m_dbSession) << R"(
create procedure [%s/v1_0_0/ReadMessagesProc] (
@recvMsgCountLimit int
,@recvTimeoutMilisecs int
,@recvTimeoutMilisecs int
) as
begin try
begin transaction;
Expand All @@ -94,22 +94,22 @@ namespace broker
,message_body [%s/v1_0_0/Message/ContentType]
);
waitfor(
receive top (@recvMsgCountLimit)
waitfor(
receive top (@recvMsgCountLimit)
queuing_order
,conversation_handle
,message_type_name
,message_body
from [%s/v1_0_0/Queue]
,message_type_name
,message_body
from [%s/v1_0_0/Queue]
into @ReceivedMessages
)
,timeout @recvTimeoutMilisecs;
)
,timeout @recvTimeoutMilisecs;
declare @RowsetOut table (content [%s/v1_0_0/Message/ContentType]);
declare @RowsetOut table (content [%s/v1_0_0/Message/ContentType]);
declare @prevDialogHandle uniqueidentifier;
declare @dialogHandle uniqueidentifier;
declare @msgTypeName sysname;
declare @msgContent [%s/v1_0_0/Message/ContentType];
declare @msgTypeName sysname;
declare @msgContent [%s/v1_0_0/Message/ContentType];
declare cursorMsg
cursor forward_only read_only
Expand All @@ -121,24 +121,24 @@ namespace broker
open cursorMsg;
fetch next from cursorMsg into @dialogHandle, @msgTypeName, @msgContent;
while @@fetch_status = 0
begin
while @@fetch_status = 0
begin
if @dialogHandle <> @prevDialogHandle and @prevDialogHandle is not null
end conversation @prevDialogHandle;
if @msgTypeName = '%s/v1_0_0/Message'
insert into @RowsetOut values (@msgContent);
insert into @RowsetOut values (@msgContent);
else if @msgTypeName = 'http://schemas.microsoft.com/SQL/ServiceBroker/Error'
throw 50001, 'There was an error during conversation with service', 1;
throw 50001, 'There was an error during conversation with service', 1;
else if @msgTypeName <> 'http://schemas.microsoft.com/SQL/ServiceBroker/EndDialog'
throw 50000, 'Message received in service broker queue had unexpected type', 1;
throw 50000, 'Message received in service broker queue had unexpected type', 1;
set @prevDialogHandle = @dialogHandle;
fetch next from cursorMsg into @dialogHandle, @msgTypeName, @msgContent;
end;
fetch next from cursorMsg into @dialogHandle, @msgTypeName, @msgContent;
end;
close cursorMsg;
deallocate cursorMsg;
Expand All @@ -147,16 +147,16 @@ namespace broker
set @dialogHandle = newid();
receive top (1)
receive top (1)
@dialogHandle = conversation_handle
from [%s/v1_0_0/Queue];
from [%s/v1_0_0/Queue];
rollback transaction doneReceiving;
if @dialogHandle <> @prevDialogHandle and @prevDialogHandle is not null
end conversation @prevDialogHandle;
select content from @RowsetOut;
select content from @RowsetOut;
commit transaction;
end try
Expand Down
Loading

0 comments on commit 233fc10

Please sign in to comment.