diff options
43 files changed, 332 insertions, 197 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES index fc4d4d2a407..3c62d863bb4 100644 --- a/cpp/CHANGES +++ b/cpp/CHANGES @@ -87,13 +87,15 @@ Changes since version 3.0.1 override the timeout and compress flag of indirect proxy endpoints. - Added ice_getSecure, ice_getLocator, ice_getRouter, - ice_getCollocationOptimization proxy methods. + ice_isCollocationOptimized proxy methods. -- Deprecated ice_newIdentity, ice_newFacet, ice_newContext, +- Deprecated ice_hash, ice_communicator, ice_collocationOptimization, + ice_connection, ice_newIdentity, ice_newFacet, ice_newContext, ice_newAdapterId and ice_newEndpoints methods proxy. You should now - use the ice_identity, ice_facet, ice_context, ice_adapterId and - ice_endpoints proxy methods. The former methods will be removed from - the next major release. + use the ice_getHash, ice_getCommunicator, ice_collocationOptimized, + ice_sgetCconnection, ice_identity, ice_facet, ice_context, + ice_adapterId and ice_endpoints proxy methods. The former methods + will be removed from the next major release. - Changed the Ice core and services to use the random generator from IceUtil. The initialization of the communicator doesn't call srand diff --git a/cpp/demo/Ice/bidir/Client.cpp b/cpp/demo/Ice/bidir/Client.cpp index f730fd025b7..5cb0aa1d576 100644 --- a/cpp/demo/Ice/bidir/Client.cpp +++ b/cpp/demo/Ice/bidir/Client.cpp @@ -64,7 +64,7 @@ CallbackClient::run(int argc, char* argv[]) ident.category = ""; adapter->add(new CallbackReceiverI, ident); adapter->activate(); - server->ice_connection()->setAdapter(adapter); + server->ice_getConnection()->setAdapter(adapter); server->addClient(ident); communicator()->waitForShutdown(); diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index 5b816776a9f..52088bb504e 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -82,9 +82,12 @@ public: bool operator==(const Object&) const; bool operator!=(const Object&) const; bool operator<(const Object&) const; - ::Ice::Int ice_hash() const; - ::Ice::CommunicatorPtr ice_communicator() const; + ICE_DEPRECATED_API ::Ice::Int ice_hash() const; + ::Ice::Int ice_getHash() const; + + ICE_DEPRECATED_API ::Ice::CommunicatorPtr ice_communicator() const; + ::Ice::CommunicatorPtr ice_getCommunicator() const; ::std::string ice_toString() const; @@ -155,8 +158,9 @@ public: ::Ice::LocatorPrx ice_getLocator() const; ::Ice::ObjectPrx ice_locator(const ::Ice::LocatorPrx&) const; - bool ice_getCollocationOptimization() const; - ::Ice::ObjectPrx ice_collocationOptimization(bool) const; + bool ice_isCollocationOptimized() const; + ICE_DEPRECATED_API ::Ice::ObjectPrx ice_collocationOptimization(bool) const; + ::Ice::ObjectPrx ice_collocationOptimized(bool) const; ::Ice::ObjectPrx ice_twoway() const; bool ice_isTwoway() const; @@ -173,7 +177,8 @@ public: ::Ice::ObjectPrx ice_timeout(int) const; ::Ice::ObjectPrx ice_connectionId(const ::std::string&) const; - ::Ice::ConnectionPtr ice_connection(); + ICE_DEPRECATED_API ::Ice::ConnectionPtr ice_connection(); + ::Ice::ConnectionPtr ice_getConnection(); ::IceInternal::ReferencePtr __reference() const; void __copyFrom(const ::Ice::ObjectPrx&); diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp index 7e37ad0ce1f..6554eda8b3b 100644 --- a/cpp/src/Glacier2/RequestQueue.cpp +++ b/cpp/src/Glacier2/RequestQueue.cpp @@ -170,7 +170,7 @@ Glacier2::Request::isBatch() const ConnectionPtr Glacier2::Request::getConnection() const { - return _proxy->ice_connection(); + return _proxy->ice_getConnection(); } Glacier2::Response::Response(const AMD_Array_Object_ice_invokePtr& amdCB, bool ok, diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 1611c953f29..94e6ce98157 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -131,12 +131,24 @@ IceProxy::Ice::Object::operator<(const Object& r) const Int IceProxy::Ice::Object::ice_hash() const { + return ice_getHash(); +} + +Int +IceProxy::Ice::Object::ice_getHash() const +{ return _reference->hash(); } CommunicatorPtr IceProxy::Ice::Object::ice_communicator() const { + return ice_getCommunicator(); +} + +CommunicatorPtr +IceProxy::Ice::Object::ice_getCommunicator() const +{ return _reference->getCommunicator(); } @@ -651,7 +663,7 @@ IceProxy::Ice::Object::ice_locator(const LocatorPrx& locator) const } bool -IceProxy::Ice::Object::ice_getCollocationOptimization() const +IceProxy::Ice::Object::ice_isCollocationOptimized() const { return _reference->getCollocationOptimization(); } @@ -659,6 +671,12 @@ IceProxy::Ice::Object::ice_getCollocationOptimization() const ObjectPrx IceProxy::Ice::Object::ice_collocationOptimization(bool b) const { + return ice_collocationOptimized(b); +} + +ObjectPrx +IceProxy::Ice::Object::ice_collocationOptimized(bool b) const +{ if(b == _reference->getCollocationOptimization()) { return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); @@ -827,6 +845,12 @@ IceProxy::Ice::Object::ice_connectionId(const string& id) const ConnectionPtr IceProxy::Ice::Object::ice_connection() { + return ice_getConnection(); +} + +ConnectionPtr +IceProxy::Ice::Object::ice_getConnection() +{ int __cnt = 0; while(true) { diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index c426735b85d..9347ff82c09 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -175,7 +175,7 @@ IceInternal::RouterInfo::getClientProxy() // try { - _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout()); + _clientProxy = _clientProxy->ice_timeout(_router->ice_getConnection()->timeout()); } catch(const Ice::CollocationOptimizationException&) { @@ -199,7 +199,7 @@ IceInternal::RouterInfo::setClientProxy(const ObjectPrx& clientProxy) // try { - _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout()); + _clientProxy = _clientProxy->ice_timeout(_router->ice_getConnection()->timeout()); } catch(const Ice::CollocationOptimizationException&) { diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index d512c82f6af..9104d68ece5 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -423,7 +423,7 @@ NodeService::start(int argc, char* argv[]) try { Ice::ObjectPrx object = _adapter->addWithUUID(new FileUserAccountMapperI(userAccountFileProperty)); - object = object->ice_collocationOptimization(true); + object = object->ice_collocationOptimized(true); mapper = UserAccountMapperPrx::uncheckedCast(object); } catch(const std::string& msg) diff --git a/cpp/src/IceGrid/InternalRegistryI.cpp b/cpp/src/IceGrid/InternalRegistryI.cpp index b655a31f4b2..43332e40a1f 100644 --- a/cpp/src/IceGrid/InternalRegistryI.cpp +++ b/cpp/src/IceGrid/InternalRegistryI.cpp @@ -70,7 +70,7 @@ public: } catch(const Ice::LocalException& ex) { - Ice::Warning out(_proxy->ice_communicator()->getLogger()); + Ice::Warning out(_proxy->ice_getCommunicator()->getLogger()); out << "unexpected exception while reaping node session:\n" << ex; } } diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index ddf4efdb535..b51be9e8789 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -287,7 +287,7 @@ LocatorI::LocatorI(const Ice::CommunicatorPtr& communicator, const Ice::LocatorRegistryPrx& locatorRegistry) : _communicator(communicator), _database(database), - _locatorRegistry(Ice::LocatorRegistryPrx::uncheckedCast(locatorRegistry->ice_collocationOptimization(false))) + _locatorRegistry(Ice::LocatorRegistryPrx::uncheckedCast(locatorRegistry->ice_collocationOptimized(false))) { } diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index a48dfb956c8..42afc878e0f 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -38,7 +38,7 @@ public: Ice::Trace out(_traceLevels->logger, _traceLevels->serverCat); out << "loaded `" << _id << "' on node `" << _node << "'"; } - _server->loadCallback(ServerPrx::uncheckedCast(proxy->ice_collocationOptimization(false)), adapters, at, dt); + _server->loadCallback(ServerPrx::uncheckedCast(proxy->ice_collocationOptimized(false)), adapters, at, dt); } void diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index dedc04e07c5..27a1c73f9fb 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -103,7 +103,7 @@ public: } catch(const Ice::LocalException& ex) { - Ice::Warning out(_proxy->ice_communicator()->getLogger()); + Ice::Warning out(_proxy->ice_getCommunicator()->getLogger()); out << "unexpected exception while reaping node session:\n" << ex; } } diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 5b68c70bc5a..62fdfe8bd33 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -605,11 +605,11 @@ ServerEntry::loadCallback(const ServerPrx& proxy, const AdapterPrxDict& adpts, i _loaded = _load; assert(_loaded.get()); int timeout = _cache.getNodeCache().getSessionTimeout() * 1000; // sec to ms - _proxy = ServerPrx::uncheckedCast(proxy->ice_timeout(timeout)->ice_collocationOptimization(false)); + _proxy = ServerPrx::uncheckedCast(proxy->ice_timeout(timeout)->ice_collocationOptimized(false)); _adapters.clear(); for(AdapterPrxDict::const_iterator p = adpts.begin(); p != adpts.end(); ++p) { - Ice::ObjectPrx adapter = p->second->ice_timeout(timeout)->ice_collocationOptimization(false); + Ice::ObjectPrx adapter = p->second->ice_timeout(timeout)->ice_collocationOptimized(false); _adapters.insert(make_pair(p->first, AdapterPrx::uncheckedCast(adapter))); } _activationTimeout = at + timeout; diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp index c91c87d3490..47795502db5 100644 --- a/cpp/src/IceGrid/Topics.cpp +++ b/cpp/src/IceGrid/Topics.cpp @@ -34,7 +34,7 @@ public: void ice_exception(const Ice::Exception& ex) { - Ice::Warning out(_observer->ice_communicator()->getLogger()); + Ice::Warning out(_observer->ice_getCommunicator()->getLogger()); out << "couldn't initialize registry observer:\n" << ex; } @@ -65,7 +65,7 @@ public: void ice_exception(const Ice::Exception& ex) { - Ice::Warning out(_observer->ice_communicator()->getLogger()); + Ice::Warning out(_observer->ice_getCommunicator()->getLogger()); out << "couldn't initialize node observer:\n" << ex; } @@ -94,7 +94,7 @@ NodeObserverTopic::NodeObserverTopic(const IceStorm::TopicManagerPrx& topicManag // topic because the subscribe() method is given a fixed proxy // which can't be marshalled. // - const_cast<IceStorm::TopicPrx&>(_topic) = IceStorm::TopicPrx::uncheckedCast(t->ice_collocationOptimization(true)); + const_cast<IceStorm::TopicPrx&>(_topic) = IceStorm::TopicPrx::uncheckedCast(t->ice_collocationOptimized(true)); const_cast<NodeObserverPrx&>(_publisher) = NodeObserverPrx::uncheckedCast(_topic->getPublisher()->ice_oneway()); } @@ -261,7 +261,7 @@ RegistryObserverTopic::RegistryObserverTopic(const IceStorm::TopicManagerPrx& to // topic because the subscribe() method is given a fixed proxy // which can't be marshalled. // - const_cast<IceStorm::TopicPrx&>(_topic) = IceStorm::TopicPrx::uncheckedCast(t->ice_collocationOptimization(true)); + const_cast<IceStorm::TopicPrx&>(_topic) = IceStorm::TopicPrx::uncheckedCast(t->ice_collocationOptimized(true)); const_cast<RegistryObserverPrx&>(_publisher) = RegistryObserverPrx::uncheckedCast(_topic->getPublisher()->ice_oneway()); } diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp index 8986ce37723..0cd356e93df 100755 --- a/cpp/src/IcePatch2/ClientUtil.cpp +++ b/cpp/src/IcePatch2/ClientUtil.cpp @@ -591,7 +591,8 @@ IcePatch2::Patcher::init(const FileServerPrx& server) // Make sure that _chunkSize doesn't exceed MessageSizeMax, otherwise // it won't work at all. // - int sizeMax = server->ice_communicator()->getProperties()->getPropertyAsIntWithDefault("Ice.MessageSizeMax", 1024); + int sizeMax = + server->ice_getCommunicator()->getProperties()->getPropertyAsIntWithDefault("Ice.MessageSizeMax", 1024); if(_chunkSize < 1) { const_cast<Int&>(_chunkSize) = 1; diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index 9eee974b561..1aa77ec675e 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -96,7 +96,7 @@ allTests(const Ice::CommunicatorPtr& communicator) TestIntfPrx test1 = adapter->getTestIntf(); TestIntfPrx test2 = adapter->getTestIntf(); - test(test1->ice_connection() == test2->ice_connection()); + test(test1->ice_getConnection() == test2->ice_getConnection()); test1->ice_ping(); test2->ice_ping(); @@ -104,8 +104,8 @@ allTests(const Ice::CommunicatorPtr& communicator) com->deactivateObjectAdapter(adapter); TestIntfPrx test3 = TestIntfPrx::uncheckedCast(test1); - test(test3->ice_connection() == test1->ice_connection()); - test(test3->ice_connection() == test2->ice_connection()); + test(test3->ice_getConnection() == test1->ice_getConnection()); + test(test3->ice_getConnection() == test2->ice_getConnection()); try { @@ -143,11 +143,11 @@ allTests(const Ice::CommunicatorPtr& communicator) random_shuffle(adpts.begin(), adpts.end(), randomGenerator); TestIntfPrx test3 = createTestIntfPrx(adpts); - test(test1->ice_connection() == test2->ice_connection()); - test(test2->ice_connection() == test3->ice_connection()); + test(test1->ice_getConnection() == test2->ice_getConnection()); + test(test2->ice_getConnection() == test3->ice_getConnection()); names.erase(test1->getAdapterName()); - test1->ice_connection()->close(false); + test1->ice_getConnection()->close(false); } // @@ -169,7 +169,7 @@ allTests(const Ice::CommunicatorPtr& communicator) for(vector<RemoteObjectAdapterPrx>::const_iterator q = adapters.begin(); q != adapters.end(); ++q) { - (*q)->getTestIntf()->ice_connection()->close(false); + (*q)->getTestIntf()->ice_getConnection()->close(false); } } @@ -190,11 +190,11 @@ allTests(const Ice::CommunicatorPtr& communicator) random_shuffle(adpts.begin(), adpts.end(), randomGenerator); TestIntfPrx test3 = createTestIntfPrx(adpts); - test(test1->ice_connection() == test2->ice_connection()); - test(test2->ice_connection() == test3->ice_connection()); + test(test1->ice_getConnection() == test2->ice_getConnection()); + test(test2->ice_getConnection() == test3->ice_getConnection()); names.erase(test1->getAdapterName()); - test1->ice_connection()->close(false); + test1->ice_getConnection()->close(false); } // @@ -234,11 +234,11 @@ allTests(const Ice::CommunicatorPtr& communicator) random_shuffle(adpts.begin(), adpts.end(), randomGenerator); TestIntfPrx test3 = createTestIntfPrx(adpts); - test(test1->ice_connection() == test2->ice_connection()); - test(test2->ice_connection() == test3->ice_connection()); + test(test1->ice_getConnection() == test2->ice_getConnection()); + test(test2->ice_getConnection() == test3->ice_getConnection()); names.erase(getAdapterNameWithAMI(test1)); - test1->ice_connection()->close(false); + test1->ice_getConnection()->close(false); } // @@ -260,7 +260,7 @@ allTests(const Ice::CommunicatorPtr& communicator) for(vector<RemoteObjectAdapterPrx>::const_iterator q = adapters.begin(); q != adapters.end(); ++q) { - (*q)->getTestIntf()->ice_connection()->close(false); + (*q)->getTestIntf()->ice_getConnection()->close(false); } } @@ -281,11 +281,11 @@ allTests(const Ice::CommunicatorPtr& communicator) random_shuffle(adpts.begin(), adpts.end(), randomGenerator); TestIntfPrx test3 = createTestIntfPrx(adpts); - test(test1->ice_connection() == test2->ice_connection()); - test(test2->ice_connection() == test3->ice_connection()); + test(test1->ice_getConnection() == test2->ice_getConnection()); + test(test2->ice_getConnection() == test3->ice_getConnection()); names.erase(test1->getAdapterName()); - test1->ice_connection()->close(false); + test1->ice_getConnection()->close(false); } // @@ -317,7 +317,7 @@ allTests(const Ice::CommunicatorPtr& communicator) while(!names.empty()) { names.erase(test->getAdapterName()); - test->ice_connection()->close(false); + test->ice_getConnection()->close(false); } test = TestIntfPrx::uncheckedCast(test->ice_endpointSelection(Ice::Random)); @@ -329,7 +329,7 @@ allTests(const Ice::CommunicatorPtr& communicator) while(!names.empty()) { names.erase(test->getAdapterName()); - test->ice_connection()->close(false); + test->ice_getConnection()->close(false); } deactivate(com, adapters); @@ -382,11 +382,11 @@ allTests(const Ice::CommunicatorPtr& communicator) adapters.push_back(com->createObjectAdapter("Adapter36", endpoints[2]->toString())); for(i = 0; i < nRetry && test->getAdapterName() == "Adapter36"; i++); test(i == nRetry); - test->ice_connection()->close(false); + test->ice_getConnection()->close(false); adapters.push_back(com->createObjectAdapter("Adapter35", endpoints[1]->toString())); for(i = 0; i < nRetry && test->getAdapterName() == "Adapter35"; i++); test(i == nRetry); - test->ice_connection()->close(false); + test->ice_getConnection()->close(false); adapters.push_back(com->createObjectAdapter("Adapter34", endpoints[0]->toString())); for(i = 0; i < nRetry && test->getAdapterName() == "Adapter34"; i++); test(i == nRetry); @@ -403,7 +403,7 @@ allTests(const Ice::CommunicatorPtr& communicator) TestIntfPrx test2 = TestIntfPrx::uncheckedCast(adapter->getTestIntf()->ice_cacheConnection(false)); test(!test1->ice_getCacheConnection()); test(!test2->ice_getCacheConnection()); - test(test1->ice_connection() == test2->ice_connection()); + test(test1->ice_getConnection() == test2->ice_getConnection()); test1->ice_ping(); @@ -412,7 +412,7 @@ allTests(const Ice::CommunicatorPtr& communicator) TestIntfPrx test3 = TestIntfPrx::uncheckedCast(test1); try { - test(test3->ice_connection() == test1->ice_connection()); + test(test3->ice_getConnection() == test1->ice_getConnection()); test(false); } catch(const Ice::ConnectionRefusedException&) @@ -622,7 +622,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(test->getAdapterName() == "Adapter71"); TestIntfPrx testUDP = TestIntfPrx::uncheckedCast(test->ice_datagram()); - test(test->ice_connection() != testUDP->ice_connection()); + test(test->ice_getConnection() != testUDP->ice_getConnection()); try { testUDP->getAdapterName(); @@ -646,7 +646,7 @@ allTests(const Ice::CommunicatorPtr& communicator) for(i = 0; i < 5; i++) { test(test->getAdapterName() == "Adapter82"); - test->ice_connection()->close(false); + test->ice_getConnection()->close(false); } TestIntfPrx testSecure = TestIntfPrx::uncheckedCast(test->ice_secure(true)); @@ -655,14 +655,14 @@ allTests(const Ice::CommunicatorPtr& communicator) test(!testSecure->ice_getSecure()); testSecure = TestIntfPrx::uncheckedCast(test->ice_secure(true)); test(testSecure->ice_getSecure()); - test(test->ice_connection() != testSecure->ice_connection()); + test(test->ice_getConnection() != testSecure->ice_getConnection()); com->deactivateObjectAdapter(adapters[1]); for(i = 0; i < 5; i++) { test(test->getAdapterName() == "Adapter81"); - test->ice_connection()->close(false); + test->ice_getConnection()->close(false); } com->createObjectAdapter("Adapter83", (test->ice_getEndpoints()[1])->toString()); // Reactive tcp OA. @@ -670,7 +670,7 @@ allTests(const Ice::CommunicatorPtr& communicator) for(i = 0; i < 5; i++) { test(test->getAdapterName() == "Adapter83"); - test->ice_connection()->close(false); + test->ice_getConnection()->close(false); } com->deactivateObjectAdapter(adapters[0]); diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index b47213d18ea..c30da4dab97 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -363,7 +363,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) try { HelloPrx helloPrx = HelloPrx::checkedCast(communicator->stringToProxy(communicator->identityToString(id))); - Ice::ConnectionPtr connection = helloPrx->ice_connection(); + Ice::ConnectionPtr connection = helloPrx->ice_getConnection(); test(false); } catch(const Ice::CollocationOptimizationException&) diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp index 7c554a23be5..f3ebb343833 100644 --- a/cpp/test/Ice/operations/AllTests.cpp +++ b/cpp/test/Ice/operations/AllTests.cpp @@ -23,8 +23,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) test(base); cout << "ok" << endl; - cout << "testing ice_communicator... " << flush; - test(base->ice_communicator() == communicator); + cout << "testing ice_getCommunicator... " << flush; + test(base->ice_getCommunicator() == communicator); cout << "ok" << endl; cout << "testing proxy methods... " << flush; @@ -39,8 +39,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) test(base->ice_batchDatagram()->ice_isBatchDatagram()); test(base->ice_secure(true)->ice_getSecure()); test(!base->ice_secure(false)->ice_getSecure()); - test(base->ice_collocationOptimization(true)->ice_getCollocationOptimization()); - test(!base->ice_collocationOptimization(false)->ice_getCollocationOptimization()); + test(base->ice_collocationOptimized(true)->ice_isCollocationOptimized()); + test(!base->ice_collocationOptimized(false)->ice_isCollocationOptimized()); cout << "ok" << endl; cout << "testing checked cast... " << flush; diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp index 7749e88be68..918db1778c9 100644 --- a/cpp/test/Ice/operations/BatchOneways.cpp +++ b/cpp/test/Ice/operations/BatchOneways.cpp @@ -66,7 +66,7 @@ batchOneways(const Test::MyClassPrx& p) test(false); } - batch->ice_connection()->flushBatchRequests(); + batch->ice_getConnection()->flushBatchRequests(); } for(i = 0 ; i < 10 ; ++i) @@ -94,6 +94,6 @@ batchOneways(const Test::MyClassPrx& p) test(false); } - batch->ice_connection()->flushBatchRequests(); + batch->ice_getConnection()->flushBatchRequests(); } } diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index 95d8a6f835a..694933833dc 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -139,7 +139,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // TimeoutPrx to = TimeoutPrx::uncheckedCast(obj->ice_timeout(500)); to->holdAdapter(750); - to->ice_connection()->close(true); // Force a reconnect. + to->ice_getConnection()->close(true); // Force a reconnect. try { to->op(); @@ -157,7 +157,7 @@ allTests(const Ice::CommunicatorPtr& communicator) timeout->op(); // Ensure adapter is active. TimeoutPrx to = TimeoutPrx::uncheckedCast(obj->ice_timeout(1000)); to->holdAdapter(500); - to->ice_connection()->close(true); // Force a reconnect. + to->ice_getConnection()->close(true); // Force a reconnect. try { to->op(); diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index 19ffe431337..e44a745cd93 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -654,7 +654,7 @@ allTests(const Ice::CommunicatorPtr& communicator) NodeObserverI* nodeObs1 = new NodeObserverI(); Ice::ObjectPrx no1 = adpt1->addWithUUID(nodeObs1); adpt1->activate(); - registry->ice_connection()->setAdapter(adpt1); + registry->ice_getConnection()->setAdapter(adpt1); session1->setObserversByIdentity(ro1->ice_getIdentity(), no1->ice_getIdentity()); Ice::ObjectAdapterPtr adpt2 = communicator->createObjectAdapterWithEndpoints("Observer2", "default"); @@ -866,7 +866,7 @@ allTests(const Ice::CommunicatorPtr& communicator) NodeObserverI* nodeObs1 = new NodeObserverI(); Ice::ObjectPrx no1 = adpt1->addWithUUID(nodeObs1); adpt1->activate(); - registry->ice_connection()->setAdapter(adpt1); + registry->ice_getConnection()->setAdapter(adpt1); session1->setObserversByIdentity(ro1->ice_getIdentity(), no1->ice_getIdentity()); regObs1->waitForUpdate(__FILE__, __LINE__); @@ -1164,7 +1164,7 @@ allTests(const Ice::CommunicatorPtr& communicator) NodeObserverI* nodeObs1 = new NodeObserverI(); Ice::ObjectPrx no1 = adpt1->addWithUUID(nodeObs1); adpt1->activate(); - registry->ice_connection()->setAdapter(adpt1); + registry->ice_getConnection()->setAdapter(adpt1); session1->setObserversByIdentity(ro1->ice_getIdentity(), no1->ice_getIdentity()); regObs1->waitForUpdate(__FILE__, __LINE__); diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index a8bd6ba2efe..d89a647c143 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -238,7 +238,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir) // try { - IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_connection()); + IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_getConnection()); test(info.certs.size() == 2); } catch(const IceSSL::ConnectionInvalidException&) @@ -344,7 +344,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir) test(serverCert->verify(caCert->getPublicKey())); test(caCert->verify(caCert->getPublicKey())); - IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_connection()); + IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_getConnection()); test(info.certs.size() == 2); @@ -499,7 +499,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir) { string cipherSub = "ADH-"; server->checkCipher(cipherSub); - IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_connection()); + IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_getConnection()); test(info.cipher.compare(0, cipherSub.size(), cipherSub) == 0); } catch(const LocalException&) @@ -515,7 +515,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir) // verifier->reset(); verifier->returnValue(false); - server->ice_connection()->close(false); + server->ice_getConnection()->close(false); try { server->ice_ping(); @@ -859,7 +859,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir) { string cipherSub = "ADH-"; server->checkCipher(cipherSub); - IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_connection()); + IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_getConnection()); test(info.cipher.compare(0, cipherSub.size(), cipherSub) == 0); } catch(const LocalException&) diff --git a/cs/demo/Ice/bidir/Client.cs b/cs/demo/Ice/bidir/Client.cs index 3125d9b41c0..39d7e37b5f0 100755 --- a/cs/demo/Ice/bidir/Client.cs +++ b/cs/demo/Ice/bidir/Client.cs @@ -35,7 +35,7 @@ public class Client : Ice.Application ident.category = ""; adapter.add(new CallbackReceiverI(), ident); adapter.activate(); - server.ice_connection().setAdapter(adapter); + server.ice_getConnection().setAdapter(adapter); server.addClient(ident); communicator().waitForShutdown(); diff --git a/cs/src/Ice/Proxy.cs b/cs/src/Ice/Proxy.cs index 81291c6294c..f5513991498 100644 --- a/cs/src/Ice/Proxy.cs +++ b/cs/src/Ice/Proxy.cs @@ -16,9 +16,13 @@ namespace Ice { public interface ObjectPrx { + [Obsolete("This method has been deprecated, use ice_getHash instead.")] int ice_hash(); + int ice_getHash(); + [Obsolete("This method has been deprecated, use ice_getCommunicator instead.")] Communicator ice_communicator(); + Communicator ice_getCommunicator(); string ice_toString(); @@ -87,8 +91,10 @@ namespace Ice Ice.LocatorPrx ice_getLocator(); ObjectPrx ice_locator(Ice.LocatorPrx locator); - bool ice_getCollocationOptimization(); + bool ice_isCollocationOptimized(); + [Obsolete("This method has been deprecated, use ice_collocationOptimized instead.")] ObjectPrx ice_collocationOptimization(bool b); + ObjectPrx ice_collocationOptimized(bool b); ObjectPrx ice_twoway(); bool ice_isTwoway(); @@ -105,7 +111,9 @@ namespace Ice ObjectPrx ice_timeout(int t); ObjectPrx ice_connectionId(string connectionId); + [Obsolete("This method has been deprecated, use ice_getConnection instead.")] Connection ice_connection(); + Connection ice_getConnection(); } public class ObjectPrxHelperBase : ObjectPrx @@ -117,11 +125,21 @@ namespace Ice public int ice_hash() { + return ice_getHash(); + } + + public int ice_getHash() + { return _reference.GetHashCode(); } public Communicator ice_communicator() { + return ice_getCommunicator(); + } + + public Communicator ice_getCommunicator() + { return _reference.getCommunicator(); } @@ -540,13 +558,18 @@ namespace Ice } } - public bool ice_getCollocationOptimization() + public bool ice_isCollocationOptimized() { return _reference.getCollocationOptimization(); } public ObjectPrx ice_collocationOptimization(bool b) { + return ice_collocationOptimized(b); + } + + public ObjectPrx ice_collocationOptimized(bool b) + { if(b == _reference.getCollocationOptimization()) { return this; @@ -701,6 +724,11 @@ namespace Ice public Connection ice_connection() { + return ice_getConnection(); + } + + public Connection ice_getConnection() + { int cnt__ = 0; while(true) { diff --git a/cs/src/Ice/RouterInfo.cs b/cs/src/Ice/RouterInfo.cs index 20443a15593..1b299619a79 100755 --- a/cs/src/Ice/RouterInfo.cs +++ b/cs/src/Ice/RouterInfo.cs @@ -79,7 +79,7 @@ namespace IceInternal // try { - _clientProxy = _clientProxy.ice_timeout(_router.ice_connection().timeout()); + _clientProxy = _clientProxy.ice_timeout(_router.ice_getConnection().timeout()); } catch(Ice.CollocationOptimizationException) { @@ -104,7 +104,7 @@ namespace IceInternal // try { - _clientProxy = _clientProxy.ice_timeout(_router.ice_connection().timeout()); + _clientProxy = _clientProxy.ice_timeout(_router.ice_getConnection().timeout()); } catch(Ice.CollocationOptimizationException) { diff --git a/cs/test/Ice/binding/AllTests.cs b/cs/test/Ice/binding/AllTests.cs index 882c1cd07df..1f245a1dbc0 100755 --- a/cs/test/Ice/binding/AllTests.cs +++ b/cs/test/Ice/binding/AllTests.cs @@ -119,7 +119,7 @@ public class AllTests TestIntfPrx test1 = adapter.getTestIntf(); TestIntfPrx test2 = adapter.getTestIntf(); - test(test1.ice_connection() == test2.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); test1.ice_ping(); test2.ice_ping(); @@ -127,8 +127,8 @@ public class AllTests com.deactivateObjectAdapter(adapter); TestIntfPrx test3 = TestIntfPrxHelper.uncheckedCast(test1); - test(test3.ice_connection() == test1.ice_connection()); - test(test3.ice_connection() == test2.ice_connection()); + test(test3.ice_getConnection() == test1.ice_getConnection()); + test(test3.ice_getConnection() == test2.ice_getConnection()); try { @@ -167,11 +167,11 @@ public class AllTests shuffle(ref adpts); TestIntfPrx test3 = createTestIntfPrx(adpts); test1.ice_ping(); - test(test1.ice_connection() == test2.ice_connection()); - test(test2.ice_connection() == test3.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); + test(test2.ice_getConnection() == test3.ice_getConnection()); names.Remove(test1.getAdapterName()); - test1.ice_connection().close(false); + test1.ice_getConnection().close(false); } // @@ -193,7 +193,7 @@ public class AllTests foreach(RemoteObjectAdapterPrx adpt in adapters) { - adpt.getTestIntf().ice_connection().close(false); + adpt.getTestIntf().ice_getConnection().close(false); } } @@ -214,11 +214,11 @@ public class AllTests shuffle(ref adpts); TestIntfPrx test3 = createTestIntfPrx(adpts); - test(test1.ice_connection() == test2.ice_connection()); - test(test2.ice_connection() == test3.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); + test(test2.ice_getConnection() == test3.ice_getConnection()); names.Remove(test1.getAdapterName()); - test1.ice_connection().close(false); + test1.ice_getConnection().close(false); } // @@ -259,11 +259,11 @@ public class AllTests shuffle(ref adpts); TestIntfPrx test3 = createTestIntfPrx(adpts); test1.ice_ping(); - test(test1.ice_connection() == test2.ice_connection()); - test(test2.ice_connection() == test3.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); + test(test2.ice_getConnection() == test3.ice_getConnection()); names.Remove(getAdapterNameWithAMI(test1)); - test1.ice_connection().close(false); + test1.ice_getConnection().close(false); } // @@ -285,7 +285,7 @@ public class AllTests foreach(RemoteObjectAdapterPrx adpt in adapters) { - adpt.getTestIntf().ice_connection().close(false); + adpt.getTestIntf().ice_getConnection().close(false); } } @@ -306,11 +306,11 @@ public class AllTests shuffle(ref adpts); TestIntfPrx test3 = createTestIntfPrx(adpts); - test(test1.ice_connection() == test2.ice_connection()); - test(test2.ice_connection() == test3.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); + test(test2.ice_getConnection() == test3.ice_getConnection()); names.Remove(getAdapterNameWithAMI(test1)); - test1.ice_connection().close(false); + test1.ice_getConnection().close(false); } // @@ -343,7 +343,7 @@ public class AllTests while(names.Count > 0) { names.Remove(obj.getAdapterName()); - obj.ice_connection().close(false); + obj.ice_getConnection().close(false); } obj = TestIntfPrxHelper.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Random)); @@ -355,7 +355,7 @@ public class AllTests while(names.Count > 0) { names.Remove(obj.getAdapterName()); - obj.ice_connection().close(false); + obj.ice_getConnection().close(false); } deactivate(com, adapters); @@ -409,11 +409,11 @@ public class AllTests adapters.Add(com.createObjectAdapter("Adapter36", endpoints[2].ToString())); for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter36"); i++); test(i == nRetry); - obj.ice_connection().close(false); + obj.ice_getConnection().close(false); adapters.Add(com.createObjectAdapter("Adapter35", endpoints[1].ToString())); for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter35"); i++); test(i == nRetry); - obj.ice_connection().close(false); + obj.ice_getConnection().close(false); adapters.Add(com.createObjectAdapter("Adapter34", endpoints[0].ToString())); for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter34"); i++); test(i == nRetry); @@ -431,7 +431,7 @@ public class AllTests TestIntfPrx test2 = TestIntfPrxHelper.uncheckedCast(adapter.getTestIntf().ice_cacheConnection(false)); test(!test1.ice_getCacheConnection()); test(!test2.ice_getCacheConnection()); - test(test1.ice_connection() == test2.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); test1.ice_ping(); @@ -440,7 +440,7 @@ public class AllTests TestIntfPrx test3 = TestIntfPrxHelper.uncheckedCast(test1); try { - test(test3.ice_connection() == test1.ice_connection()); + test(test3.ice_getConnection() == test1.ice_getConnection()); test(false); } catch(Ice.ConnectionRefusedException) @@ -656,7 +656,7 @@ public class AllTests test(obj.getAdapterName().Equals("Adapter71")); TestIntfPrx testUDP = TestIntfPrxHelper.uncheckedCast(obj.ice_datagram()); - test(obj.ice_connection() != testUDP.ice_connection()); + test(obj.ice_getConnection() != testUDP.ice_getConnection()); try { testUDP.getAdapterName(); @@ -681,7 +681,7 @@ public class AllTests for(i = 0; i < 5; i++) { test(obj.getAdapterName().Equals("Adapter82")); - obj.ice_connection().close(false); + obj.ice_getConnection().close(false); } TestIntfPrx testSecure = TestIntfPrxHelper.uncheckedCast(obj.ice_secure(true)); @@ -690,14 +690,14 @@ public class AllTests test(!testSecure.ice_getSecure()); testSecure = TestIntfPrxHelper.uncheckedCast(obj.ice_secure(true)); test(testSecure.ice_getSecure()); - test(obj.ice_connection() != testSecure.ice_connection()); + test(obj.ice_getConnection() != testSecure.ice_getConnection()); com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[1]); for(i = 0; i < 5; i++) { test(obj.getAdapterName().Equals("Adapter81")); - obj.ice_connection().close(false); + obj.ice_getConnection().close(false); } com.createObjectAdapter("Adapter83", (obj.ice_getEndpoints()[1]).ToString()); // Reactive tcp OA. @@ -705,7 +705,7 @@ public class AllTests for(i = 0; i < 5; i++) { test(obj.getAdapterName().Equals("Adapter83")); - obj.ice_connection().close(false); + obj.ice_getConnection().close(false); } com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[0]); diff --git a/cs/test/Ice/location/AllTests.cs b/cs/test/Ice/location/AllTests.cs index 9aff313453e..b52b62990ce 100755 --- a/cs/test/Ice/location/AllTests.cs +++ b/cs/test/Ice/location/AllTests.cs @@ -328,7 +328,7 @@ public class AllTests { HelloPrx helloPrx = HelloPrxHelper.checkedCast( communicator.stringToProxy("\"" + communicator.identityToString(id) + "\"")); - helloPrx.ice_connection(); + helloPrx.ice_getConnection(); test(false); } catch(Ice.CollocationOptimizationException) diff --git a/cs/test/Ice/operations/AllTests.cs b/cs/test/Ice/operations/AllTests.cs index ad106512be8..1c7e05fd8cd 100755 --- a/cs/test/Ice/operations/AllTests.cs +++ b/cs/test/Ice/operations/AllTests.cs @@ -27,9 +27,9 @@ public class AllTests Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf); test(baseProxy != null); Console.Out.WriteLine("ok"); - Console.Out.Write("testing ice_communicator... "); + Console.Out.Write("testing ice_getCommunicator... "); Console.Out.Flush(); - test(baseProxy.ice_communicator() == communicator); + test(baseProxy.ice_getCommunicator() == communicator); Console.Out.WriteLine("ok"); Console.Out.Write("testing proxy methods... "); @@ -44,8 +44,8 @@ public class AllTests test(baseProxy.ice_batchDatagram().ice_isBatchDatagram()); test(baseProxy.ice_secure(true).ice_getSecure()); test(!baseProxy.ice_secure(false).ice_getSecure()); - test(baseProxy.ice_collocationOptimization(true).ice_getCollocationOptimization()); - test(!baseProxy.ice_collocationOptimization(false).ice_getCollocationOptimization()); + test(baseProxy.ice_collocationOptimized(true).ice_isCollocationOptimized()); + test(!baseProxy.ice_collocationOptimized(false).ice_isCollocationOptimized()); Console.Out.WriteLine("ok"); Console.Out.Write("testing checked cast... "); diff --git a/cs/test/Ice/operations/BatchOneways.cs b/cs/test/Ice/operations/BatchOneways.cs index b671b2d3aba..b1a62544633 100644 --- a/cs/test/Ice/operations/BatchOneways.cs +++ b/cs/test/Ice/operations/BatchOneways.cs @@ -72,7 +72,7 @@ class BatchOneways test(false); } - batch.ice_connection().flushBatchRequests(); + batch.ice_getConnection().flushBatchRequests(); } for(int i = 0 ; i < 10 ; ++i) @@ -100,7 +100,7 @@ class BatchOneways test(false); } - batch.ice_connection().flushBatchRequests(); + batch.ice_getConnection().flushBatchRequests(); } } } diff --git a/cs/test/Ice/timeout/AllTests.cs b/cs/test/Ice/timeout/AllTests.cs index 86cefdcde87..98bce989185 100644 --- a/cs/test/Ice/timeout/AllTests.cs +++ b/cs/test/Ice/timeout/AllTests.cs @@ -159,7 +159,7 @@ public class AllTests // Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(500)); to.holdAdapter(750); - to.ice_connection().close(true); // Force a reconnect. + to.ice_getConnection().close(true); // Force a reconnect. try { to.op(); @@ -177,7 +177,7 @@ public class AllTests timeout.op(); // Ensure adapter is active. Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(1000)); to.holdAdapter(500); - to.ice_connection().close(true); // Force a reconnect. + to.ice_getConnection().close(true); // Force a reconnect. try { to.op(); diff --git a/java/demo/Ice/bidir/Client.java b/java/demo/Ice/bidir/Client.java index b6a8d26006a..6d736ba0b1f 100755 --- a/java/demo/Ice/bidir/Client.java +++ b/java/demo/Ice/bidir/Client.java @@ -36,7 +36,7 @@ public class Client extends Ice.Application ident.category = ""; adapter.add(new CallbackReceiverI(), ident); adapter.activate(); - server.ice_connection().setAdapter(adapter); + server.ice_getConnection().setAdapter(adapter); server.addClient(ident); communicator().waitForShutdown(); diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java index cbf5f99e4e2..0e930d7137f 100644 --- a/java/src/Ice/ObjectPrx.java +++ b/java/src/Ice/ObjectPrx.java @@ -11,9 +11,17 @@ package Ice; public interface ObjectPrx { + /** + * @deprecated This method has been replaced with ice_getHash. + **/ int ice_hash(); + int ice_getHash(); + /** + * @deprecated This method has been replaced with ice_getCommunicator. + **/ Communicator ice_communicator(); + Communicator ice_getCommunicator(); String ice_toString(); @@ -92,8 +100,12 @@ public interface ObjectPrx Ice.LocatorPrx ice_getLocator(); ObjectPrx ice_locator(Ice.LocatorPrx locator); - boolean ice_getCollocationOptimization(); + boolean ice_isCollocationOptimized(); + /** + * @deprecated This method has been replaced with ice_collocationOptimized. + **/ ObjectPrx ice_collocationOptimization(boolean b); + ObjectPrx ice_collocationOptimized(boolean b); ObjectPrx ice_twoway(); boolean ice_isTwoway(); @@ -110,7 +122,11 @@ public interface ObjectPrx ObjectPrx ice_timeout(int t); ObjectPrx ice_connectionId(String connectionId); + /** + * @deprecated This method has been replaced with ice_getConnection. + **/ Connection ice_connection(); + Connection ice_getConnection(); boolean equals(java.lang.Object r); } diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index a82c2cede1f..e572c56bf82 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -17,14 +17,31 @@ public class ObjectPrxHelperBase implements ObjectPrx return _reference.hashCode(); } + /** + * @deprecated This method has been replaced with ice_getHash. + **/ public final int ice_hash() { + return ice_getHash(); + } + + public final int + ice_getHash() + { return _reference.hashCode(); } + /** + * @deprecated This method has been replaced with ice_getCommunicator. + **/ public final Communicator ice_communicator() { + return ice_getCommunicator(); + } + + public final Communicator ice_getCommunicator() + { return _reference.getCommunicator(); } @@ -494,14 +511,23 @@ public class ObjectPrxHelperBase implements ObjectPrx } public final boolean - ice_getCollocationOptimization() + ice_isCollocationOptimized() { return _reference.getCollocationOptimization(); } + /** + * @deprecated This method has been replaced with ice_collocationOptimized. + **/ public final ObjectPrx ice_collocationOptimization(boolean b) { + return ice_collocationOptimized(b); + } + + public final ObjectPrx + ice_collocationOptimized(boolean b) + { if(b == _reference.getCollocationOptimization()) { return this; @@ -667,9 +693,18 @@ public class ObjectPrxHelperBase implements ObjectPrx } } + /** + * @deprecated This method has been replaced with ice_collocationOptimized. + **/ public final Connection ice_connection() { + return ice_getConnection(); + } + + public final Connection + ice_getConnection() + { int __cnt = 0; while(true) { diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java index 5c3b36c17b3..36f61c5956d 100644 --- a/java/src/IceInternal/RouterInfo.java +++ b/java/src/IceInternal/RouterInfo.java @@ -72,7 +72,7 @@ public final class RouterInfo // try { - _clientProxy = _clientProxy.ice_timeout(_router.ice_connection().timeout()); + _clientProxy = _clientProxy.ice_timeout(_router.ice_getConnection().timeout()); } catch(Ice.CollocationOptimizationException ex) { @@ -95,7 +95,7 @@ public final class RouterInfo // try { - _clientProxy = _clientProxy.ice_timeout(_router.ice_connection().timeout()); + _clientProxy = _clientProxy.ice_timeout(_router.ice_getConnection().timeout()); } catch(Ice.CollocationOptimizationException ex) { diff --git a/java/test/Ice/binding/AllTests.java b/java/test/Ice/binding/AllTests.java index 8870f547216..38761a6e340 100644 --- a/java/test/Ice/binding/AllTests.java +++ b/java/test/Ice/binding/AllTests.java @@ -107,7 +107,7 @@ public class AllTests TestIntfPrx test1 = adapter.getTestIntf(); TestIntfPrx test2 = adapter.getTestIntf(); - test(test1.ice_connection() == test2.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); test1.ice_ping(); test2.ice_ping(); @@ -115,8 +115,8 @@ public class AllTests com.deactivateObjectAdapter(adapter); TestIntfPrx test3 = TestIntfPrxHelper.uncheckedCast(test1); - test(test3.ice_connection() == test1.ice_connection()); - test(test3.ice_connection() == test2.ice_connection()); + test(test3.ice_getConnection() == test1.ice_getConnection()); + test(test3.ice_getConnection() == test2.ice_getConnection()); try { @@ -155,11 +155,11 @@ public class AllTests java.util.Collections.shuffle(adpts); TestIntfPrx test3 = createTestIntfPrx(adpts); - test(test1.ice_connection() == test2.ice_connection()); - test(test2.ice_connection() == test3.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); + test(test2.ice_getConnection() == test3.ice_getConnection()); names.remove(test1.getAdapterName()); - test1.ice_connection().close(false); + test1.ice_getConnection().close(false); } // @@ -183,7 +183,7 @@ public class AllTests p = adapters.iterator(); while(p.hasNext()) { - ((RemoteObjectAdapterPrx)p.next()).getTestIntf().ice_connection().close(false); + ((RemoteObjectAdapterPrx)p.next()).getTestIntf().ice_getConnection().close(false); } } @@ -204,11 +204,11 @@ public class AllTests java.util.Collections.shuffle(adpts); TestIntfPrx test3 = createTestIntfPrx(adpts); - test(test1.ice_connection() == test2.ice_connection()); - test(test2.ice_connection() == test3.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); + test(test2.ice_getConnection() == test3.ice_getConnection()); names.remove(test1.getAdapterName()); - test1.ice_connection().close(false); + test1.ice_getConnection().close(false); } // @@ -249,11 +249,11 @@ public class AllTests java.util.Collections.shuffle(adpts); TestIntfPrx test3 = createTestIntfPrx(adpts); - test(test1.ice_connection() == test2.ice_connection()); - test(test2.ice_connection() == test3.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); + test(test2.ice_getConnection() == test3.ice_getConnection()); names.remove(getAdapterNameWithAMI(test1)); - test1.ice_connection().close(false); + test1.ice_getConnection().close(false); } // @@ -277,7 +277,7 @@ public class AllTests p = adapters.iterator(); while(p.hasNext()) { - ((RemoteObjectAdapterPrx)p.next()).getTestIntf().ice_connection().close(false); + ((RemoteObjectAdapterPrx)p.next()).getTestIntf().ice_getConnection().close(false); } } @@ -298,11 +298,11 @@ public class AllTests java.util.Collections.shuffle(adpts); TestIntfPrx test3 = createTestIntfPrx(adpts); - test(test1.ice_connection() == test2.ice_connection()); - test(test2.ice_connection() == test3.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); + test(test2.ice_getConnection() == test3.ice_getConnection()); names.remove(getAdapterNameWithAMI(test1)); - test1.ice_connection().close(false); + test1.ice_getConnection().close(false); } // @@ -335,7 +335,7 @@ public class AllTests while(!names.isEmpty()) { names.remove(test.getAdapterName()); - test.ice_connection().close(false); + test.ice_getConnection().close(false); } test = TestIntfPrxHelper.uncheckedCast(test.ice_endpointSelection(Ice.EndpointSelectionType.Random)); @@ -347,7 +347,7 @@ public class AllTests while(!names.isEmpty()) { names.remove(test.getAdapterName()); - test.ice_connection().close(false); + test.ice_getConnection().close(false); } deactivate(com, adapters); @@ -401,11 +401,11 @@ public class AllTests adapters.add(com.createObjectAdapter("Adapter36", endpoints[2].toString())); for(i = 0; i < nRetry && test.getAdapterName().equals("Adapter36"); i++); test(i == nRetry); - test.ice_connection().close(false); + test.ice_getConnection().close(false); adapters.add(com.createObjectAdapter("Adapter35", endpoints[1].toString())); for(i = 0; i < nRetry && test.getAdapterName().equals("Adapter35"); i++); test(i == nRetry); - test.ice_connection().close(false); + test.ice_getConnection().close(false); adapters.add(com.createObjectAdapter("Adapter34", endpoints[0].toString())); for(i = 0; i < nRetry && test.getAdapterName().equals("Adapter34"); i++); test(i == nRetry); @@ -423,7 +423,7 @@ public class AllTests TestIntfPrx test2 = TestIntfPrxHelper.uncheckedCast(adapter.getTestIntf().ice_cacheConnection(false)); test(!test1.ice_getCacheConnection()); test(!test2.ice_getCacheConnection()); - test(test1.ice_connection() == test2.ice_connection()); + test(test1.ice_getConnection() == test2.ice_getConnection()); test1.ice_ping(); @@ -432,7 +432,7 @@ public class AllTests TestIntfPrx test3 = TestIntfPrxHelper.uncheckedCast(test1); try { - test(test3.ice_connection() == test1.ice_connection()); + test(test3.ice_getConnection() == test1.ice_getConnection()); test(false); } catch(Ice.ConnectionRefusedException ex) @@ -648,7 +648,7 @@ public class AllTests test(test.getAdapterName().equals("Adapter71")); TestIntfPrx testUDP = TestIntfPrxHelper.uncheckedCast(test.ice_datagram()); - test(test.ice_connection() != testUDP.ice_connection()); + test(test.ice_getConnection() != testUDP.ice_getConnection()); try { testUDP.getAdapterName(); @@ -673,7 +673,7 @@ public class AllTests for(i = 0; i < 5; i++) { test(test.getAdapterName().equals("Adapter82")); - test.ice_connection().close(false); + test.ice_getConnection().close(false); } TestIntfPrx testSecure = TestIntfPrxHelper.uncheckedCast(test.ice_secure(true)); @@ -682,14 +682,14 @@ public class AllTests test(!testSecure.ice_getSecure()); testSecure = TestIntfPrxHelper.uncheckedCast(test.ice_secure(true)); test(testSecure.ice_getSecure()); - test(test.ice_connection() != testSecure.ice_connection()); + test(test.ice_getConnection() != testSecure.ice_getConnection()); com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters.get(1)); for(i = 0; i < 5; i++) { test(test.getAdapterName().equals("Adapter81")); - test.ice_connection().close(false); + test.ice_getConnection().close(false); } com.createObjectAdapter("Adapter83", (test.ice_getEndpoints()[1]).toString()); // Reactive tcp OA. @@ -697,7 +697,7 @@ public class AllTests for(i = 0; i < 5; i++) { test(test.getAdapterName().equals("Adapter83")); - test.ice_connection().close(false); + test.ice_getConnection().close(false); } com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters.get(0)); diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java index 5acac13d7d2..aaeaa7b549a 100644 --- a/java/test/Ice/location/AllTests.java +++ b/java/test/Ice/location/AllTests.java @@ -340,7 +340,7 @@ public class AllTests { HelloPrx helloPrx = HelloPrxHelper.checkedCast( communicator.stringToProxy("\"" + communicator.identityToString(id) + "\"")); - Ice.Connection connection = helloPrx.ice_connection(); + Ice.Connection connection = helloPrx.ice_getConnection(); test(false); } catch(Ice.CollocationOptimizationException ex) diff --git a/java/test/Ice/operations/AllTests.java b/java/test/Ice/operations/AllTests.java index 0ddc337abde..d9fa88abc15 100644 --- a/java/test/Ice/operations/AllTests.java +++ b/java/test/Ice/operations/AllTests.java @@ -28,9 +28,9 @@ public class AllTests test(base != null); System.out.println("ok"); - System.out.print("testing ice_communicator... "); + System.out.print("testing ice_getCommunicator... "); System.out.flush(); - test(base.ice_communicator() == communicator); + test(base.ice_getCommunicator() == communicator); System.out.println("ok"); System.out.print("testing proxy methods... "); @@ -46,8 +46,8 @@ public class AllTests test(base.ice_batchDatagram().ice_isBatchDatagram()); test(base.ice_secure(true).ice_getSecure()); test(!base.ice_secure(false).ice_getSecure()); - test(base.ice_collocationOptimization(true).ice_getCollocationOptimization()); - test(!base.ice_collocationOptimization(false).ice_getCollocationOptimization()); + test(base.ice_collocationOptimized(true).ice_isCollocationOptimized()); + test(!base.ice_collocationOptimized(false).ice_isCollocationOptimized()); System.out.println("ok"); System.out.print("testing checked cast... "); diff --git a/java/test/Ice/operations/BatchOneways.java b/java/test/Ice/operations/BatchOneways.java index 8f98f6991c5..b25aea5ebed 100644 --- a/java/test/Ice/operations/BatchOneways.java +++ b/java/test/Ice/operations/BatchOneways.java @@ -69,7 +69,7 @@ class BatchOneways test(false); } - batch.ice_connection().flushBatchRequests(); + batch.ice_getConnection().flushBatchRequests(); } for(int i = 0 ; i < 10 ; ++i) @@ -97,7 +97,7 @@ class BatchOneways test(false); } - batch.ice_connection().flushBatchRequests(); + batch.ice_getConnection().flushBatchRequests(); } } } diff --git a/java/test/Ice/timeout/AllTests.java b/java/test/Ice/timeout/AllTests.java index b8a50011192..ab5ea1e1df8 100644 --- a/java/test/Ice/timeout/AllTests.java +++ b/java/test/Ice/timeout/AllTests.java @@ -174,7 +174,7 @@ public class AllTests // TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(500)); to.holdAdapter(750); - to.ice_connection().close(true); // Force a reconnect. + to.ice_getConnection().close(true); // Force a reconnect. try { to.op(); @@ -192,7 +192,7 @@ public class AllTests timeout.op(); // Ensure adapter is active. TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(1000)); to.holdAdapter(500); - to.ice_connection().close(true); // Force a reconnect. + to.ice_getConnection().close(true); // Force a reconnect. try { to.op(); diff --git a/java/test/IceSSL/configuration/AllTests.java b/java/test/IceSSL/configuration/AllTests.java index fee65402387..1b8f565def2 100644 --- a/java/test/IceSSL/configuration/AllTests.java +++ b/java/test/IceSSL/configuration/AllTests.java @@ -243,7 +243,7 @@ public class AllTests // try { - IceSSL.ConnectionInfo info = IceSSL.Util.getConnectionInfo(server.ice_connection()); + IceSSL.ConnectionInfo info = IceSSL.Util.getConnectionInfo(server.ice_getConnection()); test(info.certs.length == 2); } catch(IceSSL.ConnectionInvalidException ex) @@ -372,7 +372,7 @@ public class AllTests java.security.cert.X509Certificate caCert = (java.security.cert.X509Certificate)serverKeystore.getCertificate("cacert"); - IceSSL.ConnectionInfo info = IceSSL.Util.getConnectionInfo(server.ice_connection()); + IceSSL.ConnectionInfo info = IceSSL.Util.getConnectionInfo(server.ice_getConnection()); test(info.certs.length == 2); @@ -513,7 +513,7 @@ public class AllTests { String cipherSub = "DH_anon"; server.checkCipher(cipherSub); - IceSSL.ConnectionInfo info = IceSSL.Util.getConnectionInfo(server.ice_connection()); + IceSSL.ConnectionInfo info = IceSSL.Util.getConnectionInfo(server.ice_getConnection()); test(info.cipher.indexOf(cipherSub) >= 0); } catch(Ice.LocalException ex) @@ -529,7 +529,7 @@ public class AllTests // verifier.reset(); verifier.returnValue(false); - server.ice_connection().close(false); + server.ice_getConnection().close(false); try { server.ice_ping(); diff --git a/py/demo/Ice/bidir/Client.py b/py/demo/Ice/bidir/Client.py index 44ceb79646d..550ca52674f 100644 --- a/py/demo/Ice/bidir/Client.py +++ b/py/demo/Ice/bidir/Client.py @@ -46,7 +46,7 @@ class Client(Ice.Application): ident.category = "" adapter.add(CallbackReceiverI(), ident) adapter.activate() - server.ice_connection().setAdapter(adapter) + server.ice_getConnection().setAdapter(adapter) server.addClient(ident) self.communicator().waitForShutdown() diff --git a/py/modules/IcePy/Proxy.cpp b/py/modules/IcePy/Proxy.cpp index 3e959169b37..a2539c00c6f 100644 --- a/py/modules/IcePy/Proxy.cpp +++ b/py/modules/IcePy/Proxy.cpp @@ -124,7 +124,7 @@ allocateProxy(const Ice::ObjectPrx& proxy, const Ice::CommunicatorPtr& communica // //if(proxy) //{ - // p->proxy = new Ice::ObjectPrx(proxy->ice_collocationOptimization(false)); + // p->proxy = new Ice::ObjectPrx(proxy->ice_collocationOptimized(false)); //} // p->proxy = new Ice::ObjectPrx(proxy); @@ -190,6 +190,16 @@ extern "C" static PyObject* proxyIceCommunicator(ProxyObject* self) { + PyErr_Warn(PyExc_DeprecationWarning, STRCAST("ice_communicator is deprecated, use ice_getCommunicator instead.")); + return getCommunicatorWrapper(*self->communicator); +} + +#ifdef WIN32 +extern "C" +#endif +static PyObject* +proxyIceGetCommunicator(ProxyObject* self) +{ return getCommunicatorWrapper(*self->communicator); } @@ -1420,7 +1430,7 @@ proxyIceTimeout(ProxyObject* self, PyObject* args) return createProxy(newProxy, *self->communicator); } -// NOTE: ice_collocationOptimization is not currently supported. +// NOTE: ice_collocationOptimized is not currently supported. #ifdef WIN32 extern "C" @@ -1454,14 +1464,14 @@ proxyIceConnectionId(ProxyObject* self, PyObject* args) extern "C" #endif static PyObject* -proxyIceConnection(ProxyObject* self) +proxyIceGetConnection(ProxyObject* self) { assert(self->proxy); Ice::ConnectionPtr con; try { - con = (*self->proxy)->ice_connection(); + con = (*self->proxy)->ice_getConnection(); } catch(const Ice::Exception& ex) { @@ -1480,6 +1490,16 @@ proxyIceConnection(ProxyObject* self) } } +#ifdef WIN32 +extern "C" +#endif +static PyObject* +proxyIceConnection(ProxyObject* self) +{ + PyErr_Warn(PyExc_DeprecationWarning, STRCAST("ice_connection is deprecated, use ice_getConnection instead.")); + return proxyIceGetConnection(self); +} + static PyObject* checkedCastImpl(ProxyObject* p, const string& id, const string& facet, PyObject* type) { @@ -1797,7 +1817,9 @@ static PyMethodDef EndpointMethods[] = static PyMethodDef ProxyMethods[] = { { STRCAST("ice_communicator"), (PyCFunction)proxyIceCommunicator, METH_NOARGS, - PyDoc_STR(STRCAST("ice_communicator() -> Ice.Communicator")) }, + PyDoc_STR(STRCAST("ice_communicator() -> Ice.Communicator")) }, // Deprecated + { STRCAST("ice_getCommunicator"), (PyCFunction)proxyIceGetCommunicator, METH_NOARGS, + PyDoc_STR(STRCAST("ice_getCommunicator() -> Ice.Communicator")) }, { STRCAST("ice_toString"), (PyCFunction)proxyRepr, METH_NOARGS, PyDoc_STR(STRCAST("ice_toString() -> string")) }, { STRCAST("ice_isA"), (PyCFunction)proxyIceIsA, METH_VARARGS, @@ -1891,7 +1913,9 @@ static PyMethodDef ProxyMethods[] = { STRCAST("ice_connectionId"), (PyCFunction)proxyIceConnectionId, METH_VARARGS, PyDoc_STR(STRCAST("ice_connectionId(string) -> Ice.ObjectPrx")) }, { STRCAST("ice_connection"), (PyCFunction)proxyIceConnection, METH_NOARGS, - PyDoc_STR(STRCAST("ice_connection() -> Ice.Connection")) }, + PyDoc_STR(STRCAST("ice_connection() -> Ice.Connection")) }, // Deprecated + { STRCAST("ice_getConnection"), (PyCFunction)proxyIceGetConnection, METH_NOARGS, + PyDoc_STR(STRCAST("ice_getConnection() -> Ice.Connection")) }, { STRCAST("ice_checkedCast"), (PyCFunction)proxyIceCheckedCast, METH_VARARGS | METH_CLASS, PyDoc_STR(STRCAST("ice_checkedCast(proxy, id[, facetOrCtx[, ctx]]) -> proxy")) }, { STRCAST("ice_uncheckedCast"), (PyCFunction)proxyIceUncheckedCast, METH_VARARGS | METH_CLASS, diff --git a/py/test/Ice/binding/AllTests.py b/py/test/Ice/binding/AllTests.py index 36a3427d08c..ecdfc70d3bb 100644 --- a/py/test/Ice/binding/AllTests.py +++ b/py/test/Ice/binding/AllTests.py @@ -68,7 +68,7 @@ def allTests(communicator): test1 = adapter.getTestIntf() test2 = adapter.getTestIntf() - test(test1.ice_connection() == test2.ice_connection()) + test(test1.ice_getConnection() == test2.ice_getConnection()) test1.ice_ping() test2.ice_ping() @@ -76,8 +76,8 @@ def allTests(communicator): com.deactivateObjectAdapter(adapter) test3 = Test.TestIntfPrx.uncheckedCast(test1) - test(test3.ice_connection() == test1.ice_connection()) - test(test3.ice_connection() == test2.ice_connection()) + test(test3.ice_getConnection() == test1.ice_getConnection()) + test(test3.ice_getConnection() == test2.ice_getConnection()) try: test3.ice_ping() @@ -108,13 +108,13 @@ def allTests(communicator): random.shuffle(adpts) test3 = createTestIntfPrx(adpts) - test(test1.ice_connection() == test2.ice_connection()) - test(test2.ice_connection() == test3.ice_connection()) + test(test1.ice_getConnection() == test2.ice_getConnection()) + test(test2.ice_getConnection() == test3.ice_getConnection()) name = test1.getAdapterName() if names.count(name) > 0: names.remove(name) - test1.ice_connection().close(False) + test1.ice_getConnection().close(False) # # Ensure that the proxy correctly caches the connection (we @@ -132,7 +132,7 @@ def allTests(communicator): test(i == nRetry) for a in adapters: - a.getTestIntf().ice_connection().close(False) + a.getTestIntf().ice_getConnection().close(False) # # Deactivate an adapter and ensure that we can still @@ -150,13 +150,13 @@ def allTests(communicator): random.shuffle(adpts) test3 = createTestIntfPrx(adpts) - test(test1.ice_connection() == test2.ice_connection()) - test(test2.ice_connection() == test3.ice_connection()) + test(test1.ice_getConnection() == test2.ice_getConnection()) + test(test2.ice_getConnection() == test3.ice_getConnection()) name = test1.getAdapterName() if names.count(name) > 0: names.remove(name) - test1.ice_connection().close(False) + test1.ice_getConnection().close(False) # # Deactivate an adapter and ensure that we can still @@ -191,13 +191,13 @@ def allTests(communicator): random.shuffle(adpts) test3 = createTestIntfPrx(adpts) - test(test1.ice_connection() == test2.ice_connection()) - test(test2.ice_connection() == test3.ice_connection()) + test(test1.ice_getConnection() == test2.ice_getConnection()) + test(test2.ice_getConnection() == test3.ice_getConnection()) name = getAdapterNameWithAMI(test1) if names.count(name) > 0: names.remove(name) - test1.ice_connection().close(False) + test1.ice_getConnection().close(False) # # Ensure that the proxy correctly caches the connection (we @@ -215,7 +215,7 @@ def allTests(communicator): test(i == nRetry) for a in adapters: - a.getTestIntf().ice_connection().close(False) + a.getTestIntf().ice_getConnection().close(False) # # Deactivate an adapter and ensure that we can still @@ -233,13 +233,13 @@ def allTests(communicator): random.shuffle(adpts) test3 = createTestIntfPrx(adpts) - test(test1.ice_connection() == test2.ice_connection()) - test(test2.ice_connection() == test3.ice_connection()) + test(test1.ice_getConnection() == test2.ice_getConnection()) + test(test2.ice_getConnection() == test3.ice_getConnection()) name = getAdapterNameWithAMI(test1) if names.count(name) > 0: names.remove(name) - test1.ice_connection().close(False) + test1.ice_getConnection().close(False) # # Deactivate an adapter and ensure that we can still @@ -268,7 +268,7 @@ def allTests(communicator): name = t.getAdapterName() if names.count(name) > 0: names.remove(name) - t.ice_connection().close(False) + t.ice_getConnection().close(False) t = Test.TestIntfPrx.uncheckedCast(t.ice_endpointSelection(Ice.EndpointSelectionType.Random)) test(t.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random) @@ -280,7 +280,7 @@ def allTests(communicator): name = t.getAdapterName() if names.count(name) > 0: names.remove(name) - t.ice_connection().close(False) + t.ice_getConnection().close(False) deactivate(com, adapters) @@ -336,13 +336,13 @@ def allTests(communicator): while i < nRetry and t.getAdapterName() == "Adapter36": i = i + 1 test(i == nRetry) - t.ice_connection().close(True) + t.ice_getConnection().close(True) adapters.append(com.createObjectAdapter("Adapter35", endpoints[1].toString())) i = 0 while i < nRetry and t.getAdapterName() == "Adapter35": i = i + 1 test(i == nRetry) - t.ice_connection().close(True) + t.ice_getConnection().close(True) adapters.append(com.createObjectAdapter("Adapter34", endpoints[0].toString())) i = 0 while i < nRetry and t.getAdapterName() == "Adapter34": @@ -361,7 +361,7 @@ def allTests(communicator): test2 = Test.TestIntfPrx.uncheckedCast(adapter.getTestIntf().ice_cacheConnection(False)) test(not test1.ice_getCacheConnection()) test(not test2.ice_getCacheConnection()) - test(test1.ice_connection() == test2.ice_connection()) + test(test1.ice_getConnection() == test2.ice_getConnection()) test1.ice_ping() @@ -369,7 +369,7 @@ def allTests(communicator): test3 = Test.TestIntfPrx.uncheckedCast(test1) try: - test(test3.ice_connection() == test1.ice_connection()) + test(test3.ice_getConnection() == test1.ice_getConnection()) test(False) except Ice.ConnectionRefusedException: pass @@ -586,7 +586,7 @@ def allTests(communicator): test(t.getAdapterName() == "Adapter71") testUDP = Test.TestIntfPrx.uncheckedCast(t.ice_datagram()) - test(t.ice_connection() != testUDP.ice_connection()) + test(t.ice_getConnection() != testUDP.ice_getConnection()) try: testUDP.getAdapterName() except Ice.TwowayOnlyException: @@ -604,7 +604,7 @@ def allTests(communicator): t = createTestIntfPrx(adapters) for i in range(0, 5): test(t.getAdapterName() == "Adapter82") - t.ice_connection().close(False) + t.ice_getConnection().close(False) testSecure = Test.TestIntfPrx.uncheckedCast(t.ice_secure(True)) test(testSecure.ice_getSecure()) @@ -612,19 +612,19 @@ def allTests(communicator): test(not testSecure.ice_getSecure()) testSecure = Test.TestIntfPrx.uncheckedCast(t.ice_secure(True)) test(testSecure.ice_getSecure()) - test(t.ice_connection() != testSecure.ice_connection()) + test(t.ice_getConnection() != testSecure.ice_getConnection()) com.deactivateObjectAdapter(adapters[1]) for i in range(0, 5): test(t.getAdapterName() == "Adapter81") - t.ice_connection().close(False) + t.ice_getConnection().close(False) com.createObjectAdapter("Adapter83", (t.ice_getEndpoints()[1]).toString()) # Reactive tcp OA. for i in range(0, 5): test(t.getAdapterName() == "Adapter83") - t.ice_connection().close(False) + t.ice_getConnection().close(False) com.deactivateObjectAdapter(adapters[0]) try: diff --git a/py/test/Ice/operations/AllTests.py b/py/test/Ice/operations/AllTests.py index 3c150ac7544..1e8a8538956 100644 --- a/py/test/Ice/operations/AllTests.py +++ b/py/test/Ice/operations/AllTests.py @@ -21,8 +21,8 @@ def allTests(communicator): test(base) print "ok" - print "testing ice_communicator...", - test(base.ice_communicator() == communicator) + print "testing ice_getCommunicator...", + test(base.ice_getCommunicator() == communicator) print "ok" print "testing proxy methods... ", |