src/Utils.cpp - Issue 29361562: Issue 3594 - remove circular references JsEngine-JsValue-JsEngine

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: src/Utils.cpp

Issue 29361562: Issue 3594 - remove circular references JsEngine-JsValue-JsEngine (Closed)

Patch Set: temporary workaround for race condition Created Dec. 1, 2016, 10:26 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: src/Utils.cpp

diff --git a/src/Utils.cpp b/src/Utils.cpp

index 1020ec5b6334a1bd293cdb3ef353fd858ae8d633..6501e069c86a09d94e5ac7b816b24884f1204ba2 100644

--- a/src/Utils.cpp

+++ b/src/Utils.cpp

@@ -24,6 +24,7 @@

#endif

#include "Utils.h"

+#include <AdblockPlus/JsEngine.h>

using namespace AdblockPlus;

@@ -104,3 +105,10 @@ std::wstring Utils::CanonizeUrl(const std::wstring& url)

}

#endif

+std::shared_ptr<JsEngine> Utils::lockJsEngine(const std::weak_ptr<JsEngine>& jsEngine)

+ auto retValue = jsEngine.lock();

+ if (!retValue)

+ throw AdblockPlus::JsEngine::JsEngineNotAvailableException();

+ return retValue;