This is an automated email from the ASF dual-hosted git repository. mmartell pushed a commit to branch GEMNC-429-copyright-notice in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 68a4fb65439fecd5d19dd34de9e96fc6234a88f2 Author: Mike Martell <[email protected]> AuthorDate: Tue Mar 5 07:59:44 2019 -0800 Revert the TcrChunkedContext change. --- clicache/integration-test2/CMakeLists.txt | 52 +++++++++++++++---------------- cppcache/src/TcrChunkedContext.hpp | 11 ++++++- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/clicache/integration-test2/CMakeLists.txt b/clicache/integration-test2/CMakeLists.txt index b8a3e78..6488e66 100644 --- a/clicache/integration-test2/CMakeLists.txt +++ b/clicache/integration-test2/CMakeLists.txt @@ -24,33 +24,31 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packages.config ${CMAKE_CURRENT_BINAR configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cs.in ${CMAKE_CURRENT_BINARY_DIR}/Config.cs) add_library( ${PROJECT_NAME} SHARED - Framework.cs - Cluster.cs - ClusterTest.cs - Config.cs.in - ${CMAKE_CURRENT_BINARY_DIR}/Config.cs - GfshTest.cs - GfshExecuteTest.cs - Gfsh.cs - GfshExecute.cs - CacheXml.cs - CacheXmlTests.cs - CqOperationTest.cs - FunctionExecutionTest.cs - QueryTest.cs - RegionTest.cs - RegionSSLTest.cs - Position.cs - TestBase.cs - cache.xml - geode.properties - xunit.runner.json - packages.config - SerializationTests.cs - ClientSslKeys/client_keystore.password.pem - ClientSslKeys/client_truststore.pem - ServerSslKeys/server_keystore.jks - ServerSslKeys/server_truststore.jks + Cluster.cs + ClusterTest.cs + Config.cs.in + ${CMAKE_CURRENT_BINARY_DIR}/Config.cs + GfshTest.cs + GfshExecuteTest.cs + Gfsh.cs + GfshExecute.cs + CacheXml.cs + CacheXmlTests.cs + CqOperationTest.cs + QueryTest.cs + RegionTest.cs + RegionSSLTest.cs + Position.cs + TestBase.cs + cache.xml + geode.properties + xunit.runner.json + packages.config + SerializationTests.cs + ClientSslKeys/client_keystore.password.pem + ClientSslKeys/client_truststore.pem + ServerSslKeys/server_keystore.jks + ServerSslKeys/server_truststore.jks ) set_source_files_properties( diff --git a/cppcache/src/TcrChunkedContext.hpp b/cppcache/src/TcrChunkedContext.hpp index e5df84c..3e548c2 100644 --- a/cppcache/src/TcrChunkedContext.hpp +++ b/cppcache/src/TcrChunkedContext.hpp @@ -41,6 +41,7 @@ class TcrChunkedResult { ACE_Semaphore* m_finalizeSema; std::shared_ptr<Exception> m_ex; bool m_inSameThread; + std::unique_ptr<AppDomainContext> appDomainContext; protected: uint16_t m_dsmemId; @@ -55,6 +56,7 @@ class TcrChunkedResult { : m_finalizeSema(nullptr), m_ex(nullptr), m_inSameThread(false), + appDomainContext(createAppDomainContext()), m_dsmemId(0) {} virtual ~TcrChunkedResult() {} void setFinalizeSemaphore(ACE_Semaphore* finalizeSema) { @@ -71,7 +73,14 @@ class TcrChunkedResult { void fireHandleChunk(const uint8_t* bytes, int32_t len, uint8_t isLastChunkWithSecurity, const CacheImpl* cacheImpl) { - handleChunk(bytes, len, isLastChunkWithSecurity, cacheImpl); + if (appDomainContext) { + appDomainContext->run( + [this, bytes, len, isLastChunkWithSecurity, cacheImpl]() { + handleChunk(bytes, len, isLastChunkWithSecurity, cacheImpl); + }); + } else { + handleChunk(bytes, len, isLastChunkWithSecurity, cacheImpl); + } } /**
