diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 08:00:37 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 08:00:37 +0000 |
| commit | 3df60a57e32024e0ba31bbf8e821534a44296253 (patch) | |
| tree | 2272857bb4c5badf36ae41ed6fd28a2c6ea22eb9 /remoting | |
| parent | 6dbb0f0658d3fd82bec3eea30c918f3a271a3f13 (diff) | |
| download | chromium_src-3df60a57e32024e0ba31bbf8e821534a44296253.zip chromium_src-3df60a57e32024e0ba31bbf8e821534a44296253.tar.gz chromium_src-3df60a57e32024e0ba31bbf8e821534a44296253.tar.bz2 | |
JingleClient to successfully connect more consistently
ajwong@ already put code to prevent the race condition however the variable
is not initialized in the constructors, this is fixed in this patch.
TBR=ajwong
BUG=74941
TEST=chromoting_simple_host starts without crashing
Review URL: http://codereview.chromium.org/6624051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/jingle_glue/jingle_client.cc | 2 | ||||
| -rw-r--r-- | remoting/jingle_glue/jingle_client.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/remoting/jingle_glue/jingle_client.cc b/remoting/jingle_glue/jingle_client.cc index 691548d..fd0bd5b 100644 --- a/remoting/jingle_glue/jingle_client.cc +++ b/remoting/jingle_glue/jingle_client.cc @@ -188,6 +188,7 @@ JingleClient::JingleClient(JingleThread* thread, state_(START), initialized_(false), closed_(false), + initialized_finished_(false), callback_(callback), signal_strategy_(signal_strategy) { } @@ -201,6 +202,7 @@ JingleClient::JingleClient(JingleThread* thread, state_(START), initialized_(false), closed_(false), + initialized_finished_(false), callback_(callback), signal_strategy_(signal_strategy), network_manager_(network_manager), diff --git a/remoting/jingle_glue/jingle_client.h b/remoting/jingle_glue/jingle_client.h index 6b49e24..0557465 100644 --- a/remoting/jingle_glue/jingle_client.h +++ b/remoting/jingle_glue/jingle_client.h @@ -111,6 +111,7 @@ class XmppSignalStrategy : public SignalStrategy, public sigslot::has_slots<> { DISALLOW_COPY_AND_ASSIGN(XmppSignalStrategy); }; +// TODO(hclam): Javascript implementation of this interface shouldn't be here. class JavascriptSignalStrategy : public SignalStrategy { public: JavascriptSignalStrategy(); |