← Back to branch summary

~marcustomlinson/unity-scopes-api/fix_relative_custom_exec_args

« back to all changes in this revision

Viewing changes to src/scopes/internal/zmq_middleware/ZmqObject.cpp

  • Committer: Tarmac
  • Author(s): Michi Henning
  • Date: 2015-08-05 08:30:51 UTC
  • mfrom: (618.1.3 allow-no-registry-ini)
  • Revision ID: tarmac-20150805083051-puim9mh6yxkduhrz
Fixed broken config: it was no longer possible to run a scope stand-alone if no registry was configured.
Fixed broken stand-alone client: endpoint path was wrong.
Fixed segfault in ObjectProxy when no registry was configured.

Approved by PS Jenkins bot, Marcus Tomlinson.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scopes/internal/zmq_middleware/ZmqObject.cpp
212
212
 
213
213
    // If a registry is configured and this object is not a registry itself,
214
214
    // attempt to locate the scope before invoking it.
215
 
    if (!this_is_registry && !this_is_ss_registry)
 
215
    if (registry_proxy && !this_is_registry && !this_is_ss_registry)
216
216
    {
217
217
        try
218
218
        {