← Back to branch summary

~ubuntu-branches/ubuntu/saucy/orbit2/saucy

« back to all changes in this revision

Viewing changes to src/orb/GIOP/giop-connection.c

  • Committer: Bazaar Package Importer
  • Author(s): Loic Minier
  • Date: 2008-01-25 12:34:42 UTC
  • mfrom: (1.2.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20080125123442-ng7dese7qblcrc8l
Tags: 1:2.14.11-0ubuntu1
* Merge with Debian; no remaining Ubuntu changes.
  - Set Maintainer to Ubuntu Desktop Team.
* New upstream release; no API change; bug fixes.
  - Upstream NEWS:
    . Fix off by one in all method name lengths
      Fixes interoperability with other ORBs (J. Specht)
  - Update autoreconf patch, 700-autoreconf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/orb/GIOP/giop-connection.c
38
38
void
39
39
giop_connection_close (GIOPConnection *cnx)
40
40
{
41
 
        if (cnx->parent.status == LINK_DISCONNECTED)
 
41
        if ((cnx->parent.status == LINK_DISCONNECTED)
 
42
            || (cnx->parent.status == LINK_TIMEOUT))
42
43
                return;
43
44
 
44
45
        if (cnx->parent.status == LINK_CONNECTED &&
181
182
                link_connection_initiate
182
183
                        (giop_connection_get_type (),
183
184
                         proto_name, remote_host_info,
184
 
                         remote_serv_info, options,
 
185
                         remote_serv_info, (LinkConnectionOptions)options,
185
186
                         "orb", orb_data,
186
187
                         "version", (guint) giop_version,
187
188
                         NULL);