Skip to content

Commit 29e2397

Browse files
Fix for Postmortem Assert (#358)
1 parent aed3373 commit 29e2397

10 files changed

Lines changed: 11 additions & 11 deletions

File tree

DeviceIdentification/DeviceIdentification.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ namespace Plugin {
118118
// It should have been the last reference we are releasing,
119119
// so it should endup in a DESTRUCTION_SUCCEEDED, if not we
120120
// are leaking...
121-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
121+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
122122

123123
// If this was running in a (container) process...
124124
if (connection != nullptr) {

DeviceInfo/DeviceInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ namespace Plugin {
116116
// It should have been the last reference we are releasing,
117117
// so it should endup in a DESTRUCTION_SUCCEEDED, if not we
118118
// are leaking...
119-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
119+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
120120
// The process can disappear in the meantime...
121121
if (connection != nullptr) {
122122
// But if it did not dissapear in the meantime, forcefully terminate it. Shoot to kill :-)

DisplayInfo/DisplayInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ namespace Plugin {
130130
// It should have been the last reference we are releasing,
131131
// so it should endup in a DESTRUCTION_SUCCEEDED, if not we
132132
// are leaking...
133-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
133+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
134134

135135
// If this was running in a (container) process...
136136
if (connection != nullptr) {

Messenger/Messenger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ namespace Plugin {
9494
// It should have been the last reference we are releasing,
9595
// so it should end up in a DESCRUCTION_SUCCEEDED, if not we
9696
// are leaking...
97-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
97+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
9898

9999
// If this was running in a (container) proccess...
100100
if (connection != nullptr) {

OpenCDMi/OCDM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ namespace Plugin {
172172
// It should have been the last reference we are releasing,
173173
// so it should end up in a DESCRUCTION_SUCCEEDED, if not we
174174
// are leaking...
175-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
175+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
176176

177177
// If this was running in a (container) proccess...
178178
if (connection != nullptr) {

Packager/Packager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ namespace {
9292
// It should have been the last reference we are releasing,
9393
// so it should end up in a DESCRUCTION_SUCCEEDED, if not we
9494
// are leaking ...
95-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
95+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
9696

9797
// If this was running in a (container) process ...
9898
if (connection != nullptr) {

PerformanceMetrics/PerformanceMetrics.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ namespace Plugin {
180180
if (_observable.IsValid() == true) {
181181
_observable->Disable();
182182
VARIABLE_IS_NOT_USED uint32_t result =_observable.Release();
183-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
183+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
184184
ASSERT(_observable.IsValid() == false);
185185
}
186186
}
@@ -203,7 +203,7 @@ namespace Plugin {
203203
_observable->Deactivated(service);
204204
_observable->Disable();
205205
VARIABLE_IS_NOT_USED uint32_t result =_observable.Release();
206-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
206+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
207207
ASSERT(_observable.IsValid() == false);
208208
}
209209
}

PlayerInfo/PlayerInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ namespace Plugin {
116116
RPC::IRemoteConnection* connection(_service->RemoteConnection(_connectionId));
117117
VARIABLE_IS_NOT_USED uint32_t result = _player->Release();
118118
_player = nullptr;
119-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
119+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
120120

121121
// The connection can disappear in the meantime...
122122
if (connection != nullptr) {

RustBridge/RustBridge.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ namespace Thunder {
118118
// It should have been the last reference we are releasing,
119119
// so it should endup in a DESTRUCTION_SUCCEEDED, if not we
120120
// are leaking...
121-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
121+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
122122

123123
// The process can disappear in the meantime...
124124
if (connection != nullptr) {

WebKitBrowser/WebKitBrowser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ namespace Plugin {
204204
// It should have been the last reference we are releasing,
205205
// so it should end up in a DESCRUCTION_SUCCEEDED, if not we
206206
// are leaking...
207-
ASSERT(result == Core::ERROR_DESTRUCTION_SUCCEEDED);
207+
ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
208208

209209
// If this was running in a (container) process...
210210
if (connection != nullptr) {

0 commit comments

Comments
 (0)