← Back to branch summary

~ubuntu-branches/ubuntu/raring/zeroc-icee-java/raring

« back to all changes in this revision

Viewing changes to src/IceInternal/OutgoingConnectionFactory.java

  • Committer: Bazaar Package Importer
  • Author(s): Francisco Moya
  • Date: 2008-08-07 23:05:39 UTC
  • mfrom: (3.1.2 gutsy)
  • Revision ID: james.westby@ubuntu.com-20080807230539-iiuezo41bclg5yxy
Tags: 1.2.0-3
http://bugs.debian.org/487027
* Upgraded packaging standards.
* Removed unsatisfiable build dependency (Closes: #487027).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/IceInternal/OutgoingConnectionFactory.java
1
1
// **********************************************************************
2
2
//
3
 
// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
 
3
// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
4
4
//
5
5
// This copy of Ice-E is licensed to you under the terms described in the
6
6
// ICEE_LICENSE file included in this distribution.
322
322
                    s.append(" and no more endpoints to try\n");
323
323
                }
324
324
                s.append(exception.toString());
325
 
                _instance.logger().trace(traceLevels.retryCat, s.toString());
 
325
                _instance.initializationData().logger.trace(traceLevels.retryCat, s.toString());
326
326
            }
327
327
        }
328
328
        
390
390
        // connections, so that callbacks from the router can be
391
391
        // received over such connections.
392
392
        //
393
 
        Ice.ObjectPrx proxy = routerInfo.getClientProxy();
394
393
        Ice.ObjectAdapter adapter = routerInfo.getAdapter();
395
394
        DefaultsAndOverrides defaultsAndOverrides = _instance.defaultsAndOverrides();
396
 
        Endpoint[] endpoints = ((Ice.ObjectPrxHelperBase)proxy).__reference().getEndpoints();
 
395
        Endpoint[] endpoints = routerInfo.getClientEndpoints();
397
396
        for(int i = 0; i < endpoints.length; i++)
398
397
        {
399
398
            Endpoint endpoint = endpoints[i];
434
433
    {
435
434
        if(_destroyed)
436
435
        {
437
 
            throw new Ice.CommunicatorDestroyedException();
 
436
            return;
438
437
        }
439
438
 
440
439
        java.util.Enumeration p = _connections.elements();