diff options
100 files changed, 138 insertions, 138 deletions
diff --git a/CHANGELOG-3.7.md b/CHANGELOG-3.7.md index 7b894f8ef62..f217892df73 100644 --- a/CHANGELOG-3.7.md +++ b/CHANGELOG-3.7.md @@ -515,7 +515,7 @@ These are the changes since Ice 3.7.1. - Fixed bug where Ice thread pools would print an invalid and harmless "low on threads" warning message when the thread pool was destroyed and if the number - of threads in the thread pool was superior or equal to the SizeWarn property. + of threads in the thread pool was superior or equal to the SizeWarn property. - Fixed a bug where the callback set with the `IceUtil::CtrlCHandler` was not cleared on destruction of the `CtrlCHandler` object. Variables captured by the @@ -591,7 +591,7 @@ These are the changes since Ice 3.7.1. - Fixed bug where Ice thread pools would print an invalid and harmless "low on threads" warning message when the thread pool was destroyed and if the number - of threads in the thread pool was superior or equal to the SizeWarn property. + of threads in the thread pool was superior or equal to the SizeWarn property. - Fixed Android IceSSL issue that caused SSL connections to hang with Android >= 8.0. diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 44d2338d611..70ad7fe0e04 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -630,7 +630,7 @@ typedef Ice::Plugin* (*PluginFactory)(const ::Ice::CommunicatorPtr& communicator * @param factory The factory function. * @param loadOnInit If true, the plug-in is always loaded (created) during communicator initialization, * even if Ice.Plugin.name is not set. When false, the plug-in is loaded (created) during communication - * initialization only if Ice.Plugin.name is set to a non-empty value (e.g.: Ice.Plugin.IceSSL=1). + * initialization only if Ice.Plugin.name is set to a non-empty value (e.g.: Ice.Plugin.IceSSL=1). */ ICE_API void registerPluginFactory(const std::string& name, PluginFactory factory, bool loadOnInit); @@ -921,7 +921,7 @@ public: private: - CommunicatorPtr _communicator; + CommunicatorPtr _communicator; }; /** diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h index d2a3eea8a80..65424d51510 100644 --- a/cpp/include/Ice/MetricsObserverI.h +++ b/cpp/include/Ice/MetricsObserverI.h @@ -34,7 +34,7 @@ public: virtual void initMetrics(const ICE_INTERNAL_HANDLE<T>&) const { - // To be overriden in specialization to initialize state attributes + // To be overridden in specialization to initialize state attributes } protected: diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h index eca7512d0a2..21ccccd0683 100644 --- a/cpp/include/IceUtil/Cond.h +++ b/cpp/include/IceUtil/Cond.h @@ -282,7 +282,7 @@ Cond::timedWaitImpl(const M& mutex, const Time& timeout) const # ifdef __APPLE__ // // The monotonic time is based on mach_absolute_time and pthread - // condition variables require time from gettimeofday so we get + // condition variables require time from gettimeofday so we get // the realtime time. // timeval tv = Time::now(Time::Realtime) + timeout; diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h index 7b808757295..fc3c3431087 100644 --- a/cpp/include/IceUtil/InputUtil.h +++ b/cpp/include/IceUtil/InputUtil.h @@ -35,7 +35,7 @@ ICE_API IceUtil::Int64 strToInt64(const char*, char**, int); // - result == 0 indicates that no digits were available for conversion // - result == "Int64 Min" or result == "Int64 Max" indicate underflow or overflow. // -ICE_API bool stringToInt64(const std::string&, IceUtil::Int64&); +ICE_API bool stringToInt64(const std::string&, IceUtil::Int64&); } diff --git a/cpp/src/Glacier2/Instrumentation.ice b/cpp/src/Glacier2/Instrumentation.ice index e38da747efa..4f644f6c439 100644 --- a/cpp/src/Glacier2/Instrumentation.ice +++ b/cpp/src/Glacier2/Instrumentation.ice @@ -73,7 +73,7 @@ local interface ObserverUpdater * Update the router sessions. * * When called, this method goes through all the sessions and for - * each sesssion RouterObserver::getSessionObserver is + * each session RouterObserver::getSessionObserver is * called. The implementation of getSessionObserver has the * possibility to return an updated observer if necessary. * diff --git a/cpp/src/Ice/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp index 221e2a3340c..bf76c436446 100644 --- a/cpp/src/Ice/CountDownLatch.cpp +++ b/cpp/src/Ice/CountDownLatch.cpp @@ -17,7 +17,7 @@ IceUtilInternal::CountDownLatch::CountDownLatch(int count) : _event = CreateEvent(0, TRUE, FALSE, 0); if(_event == 0) { - throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError()); + throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError()); } #else int rc = pthread_mutex_init(&_mutex, 0); diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp index 4d4f39405a2..b673d0f1d4e 100644 --- a/cpp/src/Ice/EndpointFactory.cpp +++ b/cpp/src/Ice/EndpointFactory.cpp @@ -24,7 +24,7 @@ IceInternal::EndpointFactory::~EndpointFactory() void IceInternal::EndpointFactory::initialize() { - // Nothing to do, can be overriden by specialization to finish initialization. + // Nothing to do, can be overridden by specialization to finish initialization. } IceInternal::EndpointFactoryPlugin::EndpointFactoryPlugin(const CommunicatorPtr& communicator, diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp index 1c46219cd44..fc6f9ad7350 100644 --- a/cpp/src/Ice/EndpointI.cpp +++ b/cpp/src/Ice/EndpointI.cpp @@ -93,6 +93,6 @@ IceInternal::EndpointI::initWithOptions(vector<string>& args) bool IceInternal::EndpointI::checkOption(const string&, const string&, const string&) { - // Must be overriden to check for options. + // Must be overridden to check for options. return false; } diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp index 180e6fa2888..5cc48b188d4 100644 --- a/cpp/src/Ice/InputStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -376,12 +376,12 @@ Ice::InputStream::readAndCheckSeqSize(int minSize) // top-level sequence or enclosed sequence it doesn't really matter). // // Otherwise, we are reading an enclosed sequence and we have to bump - // _minSeqSize by the minimum size that this sequence will require on + // _minSeqSize by the minimum size that this sequence will require on // the stream. // // The goal of this check is to ensure that when we start un-marshalling // a new sequence, we check the minimal size of this new sequence against - // the estimated remaining buffer size. This estimatation is based on + // the estimated remaining buffer size. This estimation is based on // the minimum size of the enclosing sequences, it's _minSeqSize. // if(_startSeq == -1 || i > (b.begin() + _startSeq + _minSeqSize)) diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index 3142164b805..bc99ff922d9 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -656,7 +656,7 @@ MetricsAdminI::updated(const PropertyDict& props) { if(p->first.find("IceMX.") == 0) { - // Udpate the metrics views using the new configuration. + // Update the metrics views using the new configuration. try { updateViews(); diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index ccf78cc66bd..f411bc17a43 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -1860,7 +1860,7 @@ IceInternal::recvTruncated() { #ifdef _WIN32 int err = WSAGetLastError(); - return err == WSAEMSGSIZE || err == ERROR_MORE_DATA; + return err == WSAEMSGSIZE || err == ERROR_MORE_DATA; #else // We don't get an error under Linux if a datagram is truncated. return false; diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 9e9f561ac22..1f84ae463c7 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -1304,7 +1304,7 @@ ObjectAdapterI::computePublishedEndpoints() if(endpoints.empty()) { // - // If the PublishedEndpoints property isn't set, we compute the published enpdoints + // If the PublishedEndpoints property isn't set, we compute the published endpoints // from the OA endpoints, expanding any endpoints that may be listening on INADDR_ANY // to include actual addresses in the published endpoints. // diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 44ba61e9527..37872aba7ec 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -53,7 +53,7 @@ OutgoingAsyncBase::exception(const Exception& ex) bool OutgoingAsyncBase::response() { - assert(false); // Must be overriden by request that can handle responses + assert(false); // Must be overridden by request that can handle responses return false; } @@ -409,7 +409,7 @@ OutgoingAsyncBase::getCookie() const const std::string& OutgoingAsyncBase::getOperation() const { - assert(false); // Must be overriden + assert(false); // Must be overridden static string empty; return empty; } diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp index 63da0b2c3e9..b8d57f1cce3 100644 --- a/cpp/src/Ice/PluginManagerI.cpp +++ b/cpp/src/Ice/PluginManagerI.cpp @@ -427,7 +427,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St // // Always check the static plugin factory table first, it takes - // precedence over the the entryPoint specified in the plugin + // precedence over the entryPoint specified in the plugin // property value. // if(factories) diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index f6087267c81..fcffb15c1cd 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -886,7 +886,7 @@ Activator::activate(const string& name, } // - // If an error occured before the exec() we do some cleanup and throw. + // If an error occurred before the exec() we do some cleanup and throw. // if(!message.empty()) { diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h index 19f60f2ba11..a1bb3a66b70 100644 --- a/cpp/src/IceGrid/AllocatableObjectCache.h +++ b/cpp/src/IceGrid/AllocatableObjectCache.h @@ -34,7 +34,7 @@ public: virtual void released(const SessionIPtr&); virtual bool canTryAllocate(); - void destroy(); + void destroy(); virtual void checkAllocatable(); private: diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index acaec2b9d1d..b4a957f9ccc 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -2606,19 +2606,19 @@ NodeHelper::printDiff(Output& out, const NodeHelper& helper) const if(_def.loadFactor != helper._def.loadFactor) { - out << nl << "load factor udpated"; + out << nl << "load factor updated"; } if(_def.description != helper._def.description) { - out << nl << "description udpated"; + out << nl << "description updated"; } if(!updatedPs.empty() || !removedPs.empty()) { - out << nl << "property sets udpated"; + out << nl << "property sets updated"; } if(!variables.empty() || !removeVariables.empty()) { - out << nl << "variables udpated"; + out << nl << "variables updated"; } if(!updated.empty() || !removed.empty()) { @@ -3180,7 +3180,7 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const Ice::StringSeq removeVariables = getDictRemovedElts(helper._def.variables, _def.variables); if(!variables.empty() || !removeVariables.empty()) { - out << nl << "variables udpated"; + out << nl << "variables updated"; } } { @@ -3194,7 +3194,7 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const Ice::StringSeq removed = getDictRemovedElts(helper._def.propertySets, _def.propertySets); if(!updt.empty() || !removed.empty()) { - out << nl << "property sets udpated"; + out << nl << "property sets updated"; } } { diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp index 110826408c7..628e54ca989 100644 --- a/cpp/src/IceGrid/FileCache.cpp +++ b/cpp/src/IceGrid/FileCache.cpp @@ -108,7 +108,7 @@ FileCache::getOffsetFromEnd(const string& file, int originalCount) if(is.bad()) { - throw FileNotAvailableException("unrecoverable error occured while reading file `" + file + "'"); + throw FileNotAvailableException("unrecoverable error occurred while reading file `" + file + "'"); } if(lines.empty()) @@ -205,7 +205,7 @@ FileCache::read(const string& file, Ice::Long offset, int size, Ice::Long& newOf if(is.bad()) { - throw FileNotAvailableException("unrecoverable error occured while reading file `" + file + "'"); + throw FileNotAvailableException("unrecoverable error occurred while reading file `" + file + "'"); } return is.eof(); diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index c73c4d9ac57..aa65a254a69 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -2253,7 +2253,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) _stdOutFile = getProperty(props, "Ice.StdOut"); // - // If the server is a session server and it wasn't udpated but + // If the server is a session server and it wasn't updated but // just released by a session, we don't update the configuration, // it will be done when the server is re-allocated. // diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h index 5184bd2b19a..761fb6fde98 100644 --- a/cpp/src/IceGrid/SessionI.h +++ b/cpp/src/IceGrid/SessionI.h @@ -140,7 +140,7 @@ class ClientSSLSessionManagerI : public virtual Glacier2::SSLSessionManager { public: - ClientSSLSessionManagerI(const ClientSessionFactoryPtr&); + ClientSSLSessionManagerI(const ClientSessionFactoryPtr&); virtual Glacier2::SessionPrx create(const Glacier2::SSLInfo&, const Glacier2::SessionControlPrx&, const Ice::Current&); diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp index e5993b178d4..e8c88b3f519 100644 --- a/cpp/src/IceSSL/PluginI.cpp +++ b/cpp/src/IceSSL/PluginI.cpp @@ -147,7 +147,7 @@ IceSSL::getTrustErrorDescription(TrustError error) { switch(error) { - case IceSSL::ICE_ENUM(TrustError, NoError): + case IceSSL::ICE_ENUM(TrustError, NoError): { return "no error"; } diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp index 2ae65181228..235b985b562 100644 --- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp @@ -443,7 +443,7 @@ IceSSL::SecureTransport::TransceiverI::write(IceInternal::Buffer& buf) if(buf.i == buf.b.end()) { - return IceInternal::SocketOperationNone; + return IceInternal::SocketOperationNone; } // @@ -522,7 +522,7 @@ IceSSL::SecureTransport::TransceiverI::read(IceInternal::Buffer& buf) if(buf.i == buf.b.end()) { - return IceInternal::SocketOperationNone; + return IceInternal::SocketOperationNone; } _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead, false); diff --git a/cpp/src/IceSSL/SecureTransportUtil.cpp b/cpp/src/IceSSL/SecureTransportUtil.cpp index 5e79bedef66..37e3830b793 100644 --- a/cpp/src/IceSSL/SecureTransportUtil.cpp +++ b/cpp/src/IceSSL/SecureTransportUtil.cpp @@ -402,7 +402,7 @@ loadPrivateKey(const string& file, SecCertificateRef cert, SecKeychainRef keycha item.retain(static_cast<SecCertificateRef>(const_cast<void*>(CFArrayGetValueAtIndex(added.get(), 0)))); // - // Create the association between the private key and the certificate, + // Create the association between the private key and the certificate, // kSecKeyLabel attribute should match the subject key identifier. // vector<SecKeychainAttribute> attributes; diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp index 22c6ed1ac09..d007ba6cc06 100644 --- a/cpp/src/IceStorm/Admin.cpp +++ b/cpp/src/IceStorm/Admin.cpp @@ -8,7 +8,7 @@ #include <Ice/SliceChecksums.h> #include <IceStorm/Parser.h> -#ifdef _WIN32 +#ifdef _WIN32 # include <fcntl.h> # include <io.h> #endif diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp index 9df599eec3c..6d927bf4727 100644 --- a/cpp/src/IceStorm/Subscriber.cpp +++ b/cpp/src/IceStorm/Subscriber.cpp @@ -784,7 +784,7 @@ Subscriber::error(bool dec, const Ice::Exception& e) // // It's possible to be already in the error state if the queue maximum size - // has been reached or if an ObjectNotExistException occured before. + // has been reached or if an ObjectNotExistException occurred before. // if(_state >= SubscriberStateError) { diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp index 2af835db0c8..ec5668a4e75 100644 --- a/cpp/src/IceUtil/StringConverter.cpp +++ b/cpp/src/IceUtil/StringConverter.cpp @@ -5,7 +5,7 @@ // TODO codecvt was deprecated in C++17 and cause build failures in C++17 mode // For VC++ we should replace this code with MultiByteToWideChar() and WideCharToMultiByte() #if defined(_MSC_VER) && (_MSVC_LANG >= 201703L) -# define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING +# define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING #elif (__cplusplus >= 201703L) # include <IceUtil/DisableWarnings.h> #endif diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp index 583b37a8671..33f75b7d3e5 100644 --- a/cpp/src/slice2swift/SwiftUtil.cpp +++ b/cpp/src/slice2swift/SwiftUtil.cpp @@ -1120,7 +1120,7 @@ SwiftGenerator::typeToString(const TypePtr& type, string t = ""; // - // The current module were the type is being used + // The current module where the type is being used // string currentModule = getSwiftModule(getTopLevelModule(toplevel)); BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); diff --git a/cpp/test/Ice/background/EndpointI.cpp b/cpp/test/Ice/background/EndpointI.cpp index 16b513bc0c3..da0facf3b67 100644 --- a/cpp/test/Ice/background/EndpointI.cpp +++ b/cpp/test/Ice/background/EndpointI.cpp @@ -312,7 +312,7 @@ EndpointI::operator<(const Ice::LocalObject& r) const int EndpointI::hash() const { - return _endpoint->hash(); + return _endpoint->hash(); } string diff --git a/cpp/test/Ice/optional/Test.ice b/cpp/test/Ice/optional/Test.ice index 66842e6f598..f7d736b0f85 100644 --- a/cpp/test/Ice/optional/Test.ice +++ b/cpp/test/Ice/optional/Test.ice @@ -71,7 +71,7 @@ dictionary<int, OneOptional*> IntOneOptionalPrxDict; class MultiOptional { optional(1) byte a; - optional(2) bool b; + optional(2) bool b; optional(3) short c; optional(4) int d; optional(5) long e; diff --git a/cpp/test/Ice/optional/TestAMD.ice b/cpp/test/Ice/optional/TestAMD.ice index c0393c4faed..712ece3771e 100644 --- a/cpp/test/Ice/optional/TestAMD.ice +++ b/cpp/test/Ice/optional/TestAMD.ice @@ -71,7 +71,7 @@ dictionary<int, OneOptional*> IntOneOptionalPrxDict; class MultiOptional { optional(1) byte a; - optional(2) bool b; + optional(2) bool b; optional(3) short c; optional(4) int d; optional(5) long e; diff --git a/cpp/test/Ice/retry/AllTests.cpp b/cpp/test/Ice/retry/AllTests.cpp index fe64632f5ab..ff0444e034b 100644 --- a/cpp/test/Ice/retry/AllTests.cpp +++ b/cpp/test/Ice/retry/AllTests.cpp @@ -256,7 +256,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c test(retry1->opIdempotent(4) == 4); testInvocationCount(1); testFailureCount(0); - // It suceeded after 3 retry because of the failed opIdempotent on the fixed proxy above + // It succeeded after 3 retry because of the failed opIdempotent on the fixed proxy above testRetryCount(3); cout << "ok" << endl; } diff --git a/cpp/test/IceGrid/deployer/AllTests.cpp b/cpp/test/IceGrid/deployer/AllTests.cpp index 8d703f8593a..6e0ead4e8f4 100644 --- a/cpp/test/IceGrid/deployer/AllTests.cpp +++ b/cpp/test/IceGrid/deployer/AllTests.cpp @@ -702,7 +702,7 @@ allTests(Test::TestHelper* helper) obj = TestIntfPrx::checkedCast(comm->stringToProxy("IceBox1-Service4@IceBox1.Service4.Service4")); test(obj->getProperty("ServerInstanceServiceProperty") == "service4"); obj = TestIntfPrx::checkedCast(comm->stringToProxy("IceBox2-Service4@IceBox2.Service4.Service4")); - test(obj->getProperty("IceBoxInstanceProperty") == "overriden"); + test(obj->getProperty("IceBoxInstanceProperty") == "overridden"); cout << "ok" << endl; diff --git a/cpp/test/IceGrid/deployer/application.xml b/cpp/test/IceGrid/deployer/application.xml index ba46b25089c..4010ca984e3 100644 --- a/cpp/test/IceGrid/deployer/application.xml +++ b/cpp/test/IceGrid/deployer/application.xml @@ -89,7 +89,7 @@ <property name="IceBoxInstanceProperty" value="${name}"/> </properties> <properties service="${service4}"> - <property name="IceBoxInstanceProperty" value="overriden"/> + <property name="IceBoxInstanceProperty" value="overridden"/> </properties> </server-instance> diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp index 96ecf08aa20..acb9ae5e4fe 100644 --- a/cpp/test/IceGrid/replication/AllTests.cpp +++ b/cpp/test/IceGrid/replication/AllTests.cpp @@ -1438,7 +1438,7 @@ allTests(Test::TestHelper* helper) admin->sendSignal("Node2", "SIGSTOP"); try { - // Wait for Node2 to be stopped by getting the TestAdapter.Server2 enpdoints + // Wait for Node2 to be stopped by getting the TestAdapter.Server2 endpoints while(true) { masterAdmin->ice_invocationTimeout(100)->getAdapterInfo("TestAdapter.Server2"); diff --git a/csharp/src/Glacier2/SessionFactoryHelper.cs b/csharp/src/Glacier2/SessionFactoryHelper.cs index 0460ca135ee..f1934bf657c 100644 --- a/csharp/src/Glacier2/SessionFactoryHelper.cs +++ b/csharp/src/Glacier2/SessionFactoryHelper.cs @@ -301,7 +301,7 @@ public class SessionFactoryHelper /// <summary> /// Connects to the Glacier2 router using the associated SSL credentials. /// - /// Once the connection is established, SesssionCallback.connected is called on + /// Once the connection is established, SessionCallback.connected is called on /// the callback object; upon failure, SessionCallback.connectFailed is called /// with the exception. /// </summary> diff --git a/csharp/src/Ice/AsyncResult.cs b/csharp/src/Ice/AsyncResult.cs index 8fbb7378c4a..ed83e4025d2 100644 --- a/csharp/src/Ice/AsyncResult.cs +++ b/csharp/src/Ice/AsyncResult.cs @@ -155,7 +155,7 @@ namespace IceInternal public bool sentSynchronously() { Debug.Assert(outgoing_ != null); - return outgoing_.sentSynchronously(); // No lock needed + return outgoing_.sentSynchronously(); // No lock needed } // diff --git a/csharp/src/Ice/InputStream.cs b/csharp/src/Ice/InputStream.cs index 99100142d53..7768b4de778 100644 --- a/csharp/src/Ice/InputStream.cs +++ b/csharp/src/Ice/InputStream.cs @@ -832,12 +832,12 @@ namespace Ice // top-level sequence or enclosed sequence it doesn't really matter). // // Otherwise, we are reading an enclosed sequence and we have to bump - // _minSeqSize by the minimum size that this sequence will require on + // _minSeqSize by the minimum size that this sequence will require on // the stream. // // The goal of this check is to ensure that when we start un-marshalling // a new sequence, we check the minimal size of this new sequence against - // the estimated remaining buffer size. This estimatation is based on + // the estimated remaining buffer size. This estimation is based on // the minimum size of the enclosing sequences, it's _minSeqSize. // if(_startSeq == -1 || _buf.b.position() > (_startSeq + _minSeqSize)) diff --git a/csharp/src/Ice/MetricsAdminI.cs b/csharp/src/Ice/MetricsAdminI.cs index 0056c7195dc..05567be3129 100644 --- a/csharp/src/Ice/MetricsAdminI.cs +++ b/csharp/src/Ice/MetricsAdminI.cs @@ -972,7 +972,7 @@ namespace IceInternal { if(e.Key.IndexOf("IceMX.") == 0) { - // Udpate the metrics views using the new configuration. + // Update the metrics views using the new configuration. try { updateViews(); diff --git a/csharp/src/Ice/ObjectAdapterI.cs b/csharp/src/Ice/ObjectAdapterI.cs index 41f9ca2bea4..7101f9c216c 100644 --- a/csharp/src/Ice/ObjectAdapterI.cs +++ b/csharp/src/Ice/ObjectAdapterI.cs @@ -718,7 +718,7 @@ namespace Ice } } - public void updateThreadObservers() + public void updateThreadObservers() { ThreadPool threadPool = null; lock(this) @@ -1160,7 +1160,7 @@ namespace Ice // Get the router's server proxy endpoints and use them as the published endpoints. // endpoints = new List<EndpointI>(); - foreach(EndpointI endpt in _routerInfo.getServerEndpoints()) + foreach(EndpointI endpt in _routerInfo.getServerEndpoints()) { if(!endpoints.Contains(endpt)) { @@ -1179,7 +1179,7 @@ namespace Ice if(endpoints.Count == 0) { // - // If the PublishedEndpoints property isn't set, we compute the published enpdoints + // If the PublishedEndpoints property isn't set, we compute the published endpoints // from the OA endpoints, expanding any endpoints that may be listening on INADDR_ANY // to include actual addresses in the published endpoints. // diff --git a/csharp/src/Ice/OutgoingAsync.cs b/csharp/src/Ice/OutgoingAsync.cs index c0060a42386..0d7f528b80e 100644 --- a/csharp/src/Ice/OutgoingAsync.cs +++ b/csharp/src/Ice/OutgoingAsync.cs @@ -36,7 +36,7 @@ namespace IceInternal public virtual bool response() { - Debug.Assert(false); // Must be overriden by request that can handle responses + Debug.Assert(false); // Must be overridden by request that can handle responses return false; } diff --git a/csharp/src/Ice/Patcher.cs b/csharp/src/Ice/Patcher.cs index 7f87024f707..53a87079fc9 100644 --- a/csharp/src/Ice/Patcher.cs +++ b/csharp/src/Ice/Patcher.cs @@ -115,7 +115,7 @@ namespace IceInternal } catch(Exception ex) { - throw new Ice.MarshalException("Could not read Count property during patching", ex); + throw new Ice.MarshalException("Could not read Count property during patching", ex); } } @@ -128,7 +128,7 @@ namespace IceInternal } catch(Exception ex) { - throw new Ice.MarshalException("Could not invoke Add method during patching", ex); + throw new Ice.MarshalException("Could not invoke Add method during patching", ex); } } @@ -141,7 +141,7 @@ namespace IceInternal } catch(Exception ex) { - throw new Ice.MarshalException("Could not call indexer during patching", ex); + throw new Ice.MarshalException("Could not call indexer during patching", ex); } } diff --git a/csharp/src/Ice/PluginManagerI.cs b/csharp/src/Ice/PluginManagerI.cs index 8e841ab230d..d7648b7d4fc 100644 --- a/csharp/src/Ice/PluginManagerI.cs +++ b/csharp/src/Ice/PluginManagerI.cs @@ -396,7 +396,7 @@ namespace Ice string err = "unable to load plug-in `" + entryPoint + "': "; // // Always check the static plugin factory table first, it takes - // precedence over the the entryPoint specified in the plugin + // precedence over the entryPoint specified in the plugin // property value. // PluginFactory pluginFactory = null; diff --git a/csharp/src/Ice/ThreadHookPlugin.cs b/csharp/src/Ice/ThreadHookPlugin.cs index 52a43499fc8..d24f1d12b31 100644 --- a/csharp/src/Ice/ThreadHookPlugin.cs +++ b/csharp/src/Ice/ThreadHookPlugin.cs @@ -9,7 +9,7 @@ namespace Ice /// <summary> /// Class to support thread notification hooks. Applications using /// thread notification hooks instantiate a ThreadHookPlugin with a - /// thread notification hook and return the instance from their + /// thread notification hook and return the instance from their /// PluginFactory implementation. /// </summary> public class ThreadHookPlugin : Plugin diff --git a/csharp/src/IceBox/ServiceManagerI.cs b/csharp/src/IceBox/ServiceManagerI.cs index bd0ef6e72ff..666ff46e1fe 100644 --- a/csharp/src/IceBox/ServiceManagerI.cs +++ b/csharp/src/IceBox/ServiceManagerI.cs @@ -1030,7 +1030,7 @@ class ServiceManagerI : ServiceManagerDisp_ private string[] _argv; // Filtered server argument vector private List<ServiceInfo> _services = new List<ServiceInfo>(); private bool _pendingStatusChanges = false; - private Dictionary<ServiceObserverPrx, bool> _observers = new Dictionary<ServiceObserverPrx, bool>(); + private Dictionary<ServiceObserverPrx, bool> _observers = new Dictionary<ServiceObserverPrx, bool>(); private int _traceServiceObserver = 0; } diff --git a/csharp/test/Ice/retry/AllTests.cs b/csharp/test/Ice/retry/AllTests.cs index 27e465f9dde..a642d1a4bfd 100644 --- a/csharp/test/Ice/retry/AllTests.cs +++ b/csharp/test/Ice/retry/AllTests.cs @@ -183,7 +183,7 @@ namespace Ice test(retry1.opIdempotent(4) == 4); Instrumentation.testInvocationCount(1); Instrumentation.testFailureCount(0); - // It suceeded after 3 retry because of the failed opIdempotent on the fixed proxy above + // It succeeded after 3 retry because of the failed opIdempotent on the fixed proxy above Instrumentation.testRetryCount(3); output.WriteLine("ok"); } diff --git a/csharp/test/TestCommon/TestHelper.cs b/csharp/test/TestCommon/TestHelper.cs index 076e8616d1b..cd28a2867cc 100644 --- a/csharp/test/TestCommon/TestHelper.cs +++ b/csharp/test/TestCommon/TestHelper.cs @@ -145,7 +145,7 @@ namespace Test { _controllerHelper.communicatorInitialized(communicator); } - return communicator; + return communicator; } public Ice.Communicator communicator() diff --git a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java index 574b09ff77c..b08df57d424 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java +++ b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java @@ -2143,7 +2143,7 @@ public final class ConnectionI extends IceInternal.EventHandler setState(StateClosingPending); // - // Notify the the transceiver of the graceful connection closure. + // Notify the transceiver of the graceful connection closure. // int op = _transceiver.closing(true, _exception); if(op != 0) @@ -2683,7 +2683,7 @@ public final class ConnectionI extends IceInternal.EventHandler setState(StateClosingPending, new CloseConnectionException()); // - // Notify the the transceiver of the graceful connection closure. + // Notify the transceiver of the graceful connection closure. // int op = _transceiver.closing(false, _exception); if(op != 0) diff --git a/java-compat/src/Ice/src/main/java/Ice/InputStream.java b/java-compat/src/Ice/src/main/java/Ice/InputStream.java index 2979f04a29a..5a8ef207ba0 100644 --- a/java-compat/src/Ice/src/main/java/Ice/InputStream.java +++ b/java-compat/src/Ice/src/main/java/Ice/InputStream.java @@ -864,12 +864,12 @@ public class InputStream // top-level sequence or enclosed sequence it doesn't really matter). // // Otherwise, we are reading an enclosed sequence and we have to bump - // _minSeqSize by the minimum size that this sequence will require on + // _minSeqSize by the minimum size that this sequence will require on // the stream. // // The goal of this check is to ensure that when we start un-marshalling // a new sequence, we check the minimal size of this new sequence against - // the estimated remaining buffer size. This estimatation is based on + // the estimated remaining buffer size. This estimation is based on // the minimum size of the enclosing sequences, it's _minSeqSize. // if(_startSeq == -1 || _buf.b.position() > (_startSeq + _minSeqSize)) diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java b/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java index 0c72c7f9f99..987855bed5d 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java @@ -1284,7 +1284,7 @@ public final class ObjectAdapterI implements ObjectAdapter if(endpoints.isEmpty()) { // - // If the PublishedEndpoints property isn't set, we compute the published enpdoints + // If the PublishedEndpoints property isn't set, we compute the published endpoints // from the OA endpoints, expanding any endpoints that may be listening on INADDR_ANY // to include actual addresses in the published endpoints. // diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java index c604b547136..7dc719cccbe 100644 --- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java +++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java @@ -4,7 +4,7 @@ package Ice; -public interface TwowayCallbackBoolUE extends TwowayCallbackBool +public interface TwowayCallbackBoolUE extends TwowayCallbackBool { void exception(Ice.UserException ex); } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java b/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java index 8787ab120f4..bfd2a10285c 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java @@ -332,7 +332,7 @@ public class MetricsAdminI extends IceMX._MetricsAdminDisp implements Ice.Proper { if(e.getKey().indexOf("IceMX.") == 0) { - // Udpate the metrics views using the new configuration. + // Update the metrics views using the new configuration. try { updateViews(); diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java index 650cc0856cc..9150a965249 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java @@ -157,7 +157,7 @@ public final class ProxyFactory else if(ex instanceof Ice.RequestFailedException) { // - // For all other cases, we don't retry ObjectNotExistException + // For all other cases, we don't retry ObjectNotExistException // throw ex; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Reference.java b/java-compat/src/Ice/src/main/java/IceInternal/Reference.java index 0de214adf2e..5dd87469113 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Reference.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Reference.java @@ -262,7 +262,7 @@ public abstract class Reference implements Cloneable { return Boolean.valueOf(_compress); } - return null; // Null indicates that compress is not overriden. + return null; // Null indicates that compress is not overridden. } // diff --git a/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java b/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java index b8b2dd01469..b93a43e5d1f 100644 --- a/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java +++ b/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java @@ -48,7 +48,7 @@ public class ControllerApp extends Application ClassLoader getClassLoader() { - return _loader; + return _loader; } private final ClassLoader _loader; diff --git a/java-compat/test/src/main/java/test/Ice/acm/AllTests.java b/java-compat/test/src/main/java/test/Ice/acm/AllTests.java index 9723e21f87a..dc1ac7e8eb3 100644 --- a/java-compat/test/src/main/java/test/Ice/acm/AllTests.java +++ b/java-compat/test/src/main/java/test/Ice/acm/AllTests.java @@ -271,7 +271,7 @@ public class AllTests _clientACMHeartbeat = heartbeat; } - public void setServerACM(int timeout, int close, int heartbeat) + public void setServerACM(int timeout, int close, int heartbeat) { _serverACMTimeout = timeout; _serverACMClose = close; diff --git a/java-compat/test/src/main/java/test/Ice/retry/AllTests.java b/java-compat/test/src/main/java/test/Ice/retry/AllTests.java index a0f80fafeea..038c02c76ad 100644 --- a/java-compat/test/src/main/java/test/Ice/retry/AllTests.java +++ b/java-compat/test/src/main/java/test/Ice/retry/AllTests.java @@ -216,7 +216,7 @@ public class AllTests test(retry1.opIdempotent(4) == 4); instrumentation.testInvocationCount(1); instrumentation.testFailureCount(0); - // It suceeded after 3 retry because of the failed opIdempotent on the fixed + // It succeeded after 3 retry because of the failed opIdempotent on the fixed // proxy above instrumentation.testRetryCount(3); out.println("ok"); diff --git a/java-compat/test/src/main/java/test/TestHelper.java b/java-compat/test/src/main/java/test/TestHelper.java index d5d12967c25..2d912892b18 100644 --- a/java-compat/test/src/main/java/test/TestHelper.java +++ b/java-compat/test/src/main/java/test/TestHelper.java @@ -163,7 +163,7 @@ public abstract class TestHelper _controllerHelper.communicatorInitialized(communicator); } - return communicator; + return communicator; } synchronized public void setControllerHelper(ControllerHelper controllerHelper) @@ -209,7 +209,7 @@ public abstract class TestHelper return _communicator; } - public void shutdown() + public void shutdown() { if(_communicator != null) { diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java b/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java index 0cc6c481dbd..6e94cd2063b 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java @@ -866,12 +866,12 @@ public class InputStream // top-level sequence or enclosed sequence it doesn't really matter). // // Otherwise, we are reading an enclosed sequence and we have to bump - // _minSeqSize by the minimum size that this sequence will require on + // _minSeqSize by the minimum size that this sequence will require on // the stream. // // The goal of this check is to ensure that when we start un-marshalling // a new sequence, we check the minimal size of this new sequence against - // the estimated remaining buffer size. This estimatation is based on + // the estimated remaining buffer size. This estimation is based on // the minimum size of the enclosing sequences, it's _minSeqSize. // if(_startSeq == -1 || _buf.b.position() > (_startSeq + _minSeqSize)) diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java index 8fb49c4f498..188d6ebe0b7 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java @@ -1284,7 +1284,7 @@ public final class ObjectAdapterI implements ObjectAdapter if(endpoints.isEmpty()) { // - // If the PublishedEndpoints property isn't set, we compute the published enpdoints + // If the PublishedEndpoints property isn't set, we compute the published endpoints // from the OA endpoints, expanding any endpoints that may be listening on INADDR_ANY // to include actual addresses in the published endpoints. // diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactory.java index a8fa77d9966..b680527985e 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactory.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactory.java @@ -8,7 +8,7 @@ public interface EndpointFactory { default void initialize() { - // Nothing to do, can be overriden by specialization to finish initialization. + // Nothing to do, can be overridden by specialization to finish initialization. } short type(); diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java index 1cf8b576665..96bf68671d0 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java @@ -103,7 +103,7 @@ public class FixedReference extends Reference public java.util.OptionalInt getTimeout() { - return java.util.OptionalInt.empty(); + return java.util.OptionalInt.empty(); } @Override diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsAdminI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsAdminI.java index 50ae6c70f7f..207abca331a 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsAdminI.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsAdminI.java @@ -334,7 +334,7 @@ public class MetricsAdminI implements com.zeroc.IceMX.MetricsAdmin, { if(e.getKey().indexOf("IceMX.") == 0) { - // Udpate the metrics views using the new configuration. + // Update the metrics views using the new configuration. try { updateViews(); diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java index 9ebf96b2875..0ef8a6e6bac 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java @@ -155,7 +155,7 @@ public final class ProxyFactory else if(ex instanceof com.zeroc.Ice.RequestFailedException) { // - // For all other cases, we don't retry ObjectNotExistException + // For all other cases, we don't retry ObjectNotExistException // throw ex; } diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java index b45cb69f2c7..9b19175ce64 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java @@ -264,7 +264,7 @@ public abstract class Reference implements Cloneable { return Boolean.valueOf(_compress); } - return null; // Null indicates that compress is not overriden. + return null; // Null indicates that compress is not overridden. } // diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java index 8edd719384c..d53745a999a 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java @@ -999,7 +999,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato java.util.Set<MetricsViewInfo> metrics = null; synchronized(GraphView.this) { - metrics = new java.util.HashSet<>(_series.keySet()); + metrics = new java.util.HashSet<>(_series.keySet()); } for(final MetricsViewInfo m : metrics) diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsViewEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsViewEditor.java index d80fbfc5ccd..0ac99779b43 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsViewEditor.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsViewEditor.java @@ -886,7 +886,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext } return field; } - catch(NoSuchMethodException ex) + catch(NoSuchMethodException ex) { ex.printStackTrace(); } diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java index e2bf584edef..ef702baebb1 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java @@ -169,7 +169,7 @@ public class SimpleInternalFrame extends JPanel { /** * Sets a new title text. - * * @param newText the title text tp be set */ + * * @param newText the title text tp be set */ public void setTitle(String newText) { String oldText = getTitle(); titleLabel.setText(newText); @@ -232,8 +232,8 @@ public class SimpleInternalFrame extends JPanel { * or not. In the selected state, the header background will be * rendered differently. * - * @return boolean a boolean, where true means the frame is selected - * (currently active) and false means it is not + * @return boolean a boolean, where true means the frame is selected + * (currently active) and false means it is not */ public boolean isSelected() { return selected; @@ -245,8 +245,8 @@ public class SimpleInternalFrame extends JPanel { * has the focus, or should get more attention than other * simple internal frames. * - * @param newValue a boolean, where true means the frame is selected - * (currently active) and false means it is not + * @param newValue a boolean, where true means the frame is selected + * (currently active) and false means it is not */ public void setSelected(boolean newValue) { boolean oldValue = isSelected(); diff --git a/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java b/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java index ea2c7e68b63..9cc7cb23d9c 100644 --- a/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java +++ b/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java @@ -47,7 +47,7 @@ public class ControllerApp extends Application ClassLoader getClassLoader() { - return _loader; + return _loader; } private final ClassLoader _loader; diff --git a/java/test/src/main/java/test/Ice/acm/AllTests.java b/java/test/src/main/java/test/Ice/acm/AllTests.java index 8877ea33e83..3651f525022 100644 --- a/java/test/src/main/java/test/Ice/acm/AllTests.java +++ b/java/test/src/main/java/test/Ice/acm/AllTests.java @@ -258,7 +258,7 @@ public class AllTests _clientACMHeartbeat = heartbeat; } - public void setServerACM(int timeout, int close, int heartbeat) + public void setServerACM(int timeout, int close, int heartbeat) { _serverACMTimeout = timeout; _serverACMClose = close; diff --git a/java/test/src/main/java/test/Ice/metrics/AMDServer.java b/java/test/src/main/java/test/Ice/metrics/AMDServer.java index e032a9f62ec..7687306d981 100644 --- a/java/test/src/main/java/test/Ice/metrics/AMDServer.java +++ b/java/test/src/main/java/test/Ice/metrics/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.TestHelper properties.setProperty("Ice.Warn.Dispatch", "0"); properties.setProperty("Ice.MessageSizeMax", "50000"); - try(com.zeroc.Ice.Communicator communicator = initialize(properties)) + try(com.zeroc.Ice.Communicator communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/java/test/src/main/java/test/Ice/retry/AllTests.java b/java/test/src/main/java/test/Ice/retry/AllTests.java index d8ef59539a0..9de94b50137 100644 --- a/java/test/src/main/java/test/Ice/retry/AllTests.java +++ b/java/test/src/main/java/test/Ice/retry/AllTests.java @@ -177,7 +177,7 @@ public class AllTests test(retry1.opIdempotent(4) == 4); instrumentation.testInvocationCount(1); instrumentation.testFailureCount(0); - // It suceeded after 3 retry because of the failed opIdempotent on the fixed proxy above + // It succeeded after 3 retry because of the failed opIdempotent on the fixed proxy above instrumentation.testRetryCount(3); out.println("ok"); } diff --git a/java/test/src/main/java/test/TestHelper.java b/java/test/src/main/java/test/TestHelper.java index da9b86b9509..c9952bfb9c1 100644 --- a/java/test/src/main/java/test/TestHelper.java +++ b/java/test/src/main/java/test/TestHelper.java @@ -144,7 +144,7 @@ public abstract class TestHelper { InitializationData initData = new InitializationData(); initData.properties = properties; - return initialize(initData); + return initialize(initData); } public Communicator initialize(InitializationData initData) diff --git a/js/BUILDING.md b/js/BUILDING.md index 474c7f0322d..93e6a08a4d2 100644 --- a/js/BUILDING.md +++ b/js/BUILDING.md @@ -67,7 +67,7 @@ For older browsers that do not support all of the required ECMAScript 6 features used by Ice for JavaScript, we provide pre-compiled versions of the libraries using the [Babel] JavaScript compiler. These libraries depend on the [core-js] and [regenerator-runtime] packages -and are available in the `lib/es5` subdirectory with the same names as +and are available in the `lib/es5` subdirectory with the same names as the main libraries. ## Running the JavaScript Tests diff --git a/js/src/Ice/Object.js b/js/src/Ice/Object.js index 7b85d030768..d7e27c866f2 100644 --- a/js/src/Ice/Object.js +++ b/js/src/Ice/Object.js @@ -41,7 +41,7 @@ Ice.Object = class } // - // _iceMostDerivedType returns the the most derived Ice generated class. This is + // _iceMostDerivedType returns the most derived Ice generated class. This is // necessary because the user might extend Slice generated classes. The user // class extensions don't have _iceId, _iceIds, etc static members so the implementation // of ice_id and ice_ids would fail trying to access those members of the user diff --git a/js/src/Ice/ProxyFactory.js b/js/src/Ice/ProxyFactory.js index 97c2b66ea27..e04f0ec5a8f 100644 --- a/js/src/Ice/ProxyFactory.js +++ b/js/src/Ice/ProxyFactory.js @@ -195,7 +195,7 @@ class ProxyFactory // in this process that will not change if we try again. // // The most likely cause for a MarshalException is exceeding the - // maximum message size, which is represented by the the subclass + // maximum message size, which is represented by the subclass // MemoryLimitException. For example, a client can attempt to send // a message that exceeds the maximum memory size, or accumulate // enough batch requests without flushing that the maximum size is diff --git a/js/src/Ice/Stream.js b/js/src/Ice/Stream.js index 39786aabc74..a17bdadcc5a 100644 --- a/js/src/Ice/Stream.js +++ b/js/src/Ice/Stream.js @@ -1576,12 +1576,12 @@ class InputStream // top-level sequence or enclosed sequence it doesn't really matter). // // Otherwise, we are reading an enclosed sequence and we have to bump - // _minSeqSize by the minimum size that this sequence will require on + // _minSeqSize by the minimum size that this sequence will require on // the stream. // // The goal of this check is to ensure that when we start unmarshaling // a new sequence, we check the minimal size of this new sequence against - // the estimated remaining buffer size. This estimatation is based on + // the estimated remaining buffer size. This estimation is based on // the minimum size of the enclosing sequences, it's _minSeqSize. // if(this._startSeq === -1 || this._buf.position > (this._startSeq + this._minSeqSize)) diff --git a/matlab/lib/+Ice/InputStream.m b/matlab/lib/+Ice/InputStream.m index 2e67e0a7f5f..d5bbf7ffced 100644 --- a/matlab/lib/+Ice/InputStream.m +++ b/matlab/lib/+Ice/InputStream.m @@ -802,7 +802,7 @@ classdef InputStream < handle % top-level sequence or enclosed sequence it doesn't really matter). % % Otherwise, we are reading an enclosed sequence and we have to bump - % _minSeqSize by the minimum size that this sequence will require on + % _minSeqSize by the minimum size that this sequence will require on % the stream. % % The goal of this check is to ensure that when we start un-marshalling diff --git a/matlab/lib/+IceInternal/EncapsDecoder10.m b/matlab/lib/+IceInternal/EncapsDecoder10.m index e2898c3a9bc..d13242491b7 100644 --- a/matlab/lib/+IceInternal/EncapsDecoder10.m +++ b/matlab/lib/+IceInternal/EncapsDecoder10.m @@ -165,7 +165,7 @@ classdef EncapsDecoder10 < IceInternal.EncapsDecoder % string. % if obj.sliceType == IceInternal.SliceType.ValueSlice - if obj.is.readBool() + if obj.is.readBool() typeIdIndex = obj.is.readSize(); obj.typeIdIndex = typeIdIndex; obj.typeId = obj.getTypeId(obj.typeIdIndex); diff --git a/matlab/lib/slice2matlab.m b/matlab/lib/slice2matlab.m index 10dcca02ff2..02cd1b0cf72 100644 --- a/matlab/lib/slice2matlab.m +++ b/matlab/lib/slice2matlab.m @@ -40,7 +40,7 @@ function status = slice2matlab(args) if isempty(path) status = 1; fprintf('\nerror: Cannot locate slice2matlab compiler\n'); - elseif isempty(searchPath) + elseif isempty(searchPath) status = 1; fprintf('\nerror: Cannot locate slice dir.\n'); else diff --git a/matlab/src/ice.h b/matlab/src/ice.h index ae3094b4712..5c2f1916182 100644 --- a/matlab/src/ice.h +++ b/matlab/src/ice.h @@ -12,7 +12,7 @@ # endif # endif #else -# ifndef MATLAB_PROTO +# ifndef MATLAB_PROTO # define ICE_MATLAB_API __attribute__((visibility ("default"))) # else # define ICE_MATLAB_API /**/ diff --git a/matlab/test/Ice/objects/LocalTests.m b/matlab/test/Ice/objects/LocalTests.m index d7cd9957d1b..68e6c604574 100644 --- a/matlab/test/Ice/objects/LocalTests.m +++ b/matlab/test/Ice/objects/LocalTests.m @@ -800,7 +800,7 @@ classdef LocalTests end % - % Test: dictionary with struct key and struct value type containig class. The dictionary maps to a + % Test: dictionary with struct key and struct value type containing class. The dictionary maps to a % struct array and temporarily stores IceInternal.ValueHolder objects as its values until converted. % diff --git a/objective-c/include/objc/Ice/Proxy.h b/objective-c/include/objc/Ice/Proxy.h index 24b5a0af9a7..346b9e3bbe3 100644 --- a/objective-c/include/objc/Ice/Proxy.h +++ b/objective-c/include/objc/Ice/Proxy.h @@ -96,9 +96,9 @@ ICE_API @protocol ICEObjectPrx <NSObject, NSCopying> -(id<ICEAsyncResult>) begin_ice_invoke:(NSString*)operation mode:(ICEOperationMode)mode inEncaps:(NSData*)inEncaps; -(id<ICEAsyncResult>) begin_ice_invoke:(NSString*)operation mode:(ICEOperationMode)mode inEncaps:(NSData*)inEncaps context :(ICEContext*)context; -(id<ICEAsyncResult>) begin_ice_invoke:(NSString*)operation mode:(ICEOperationMode)mode inEncaps:(NSData*)inEncaps response:(void(^)(BOOL, NSMutableData*))response exception:(void(^)(ICEException*))exception; --(id<ICEAsyncResult>) begin_ice_invoke:(NSString*)operation mode:(ICEOperationMode)mode inEncaps:(NSData*)inEncaps context:(ICEContext*)context response:(void(^)(BOOL, NSMutableData*))response exception:(void(^)(ICEException*))exception; +-(id<ICEAsyncResult>) begin_ice_invoke:(NSString*)operation mode:(ICEOperationMode)mode inEncaps:(NSData*)inEncaps context:(ICEContext*)context response:(void(^)(BOOL, NSMutableData*))response exception:(void(^)(ICEException*))exception; -(id<ICEAsyncResult>) begin_ice_invoke:(NSString*)operation mode:(ICEOperationMode)mode inEncaps:(NSData*)inEncaps response:(void(^)(BOOL, NSMutableData*))response exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent; --(id<ICEAsyncResult>) begin_ice_invoke:(NSString*)operation mode:(ICEOperationMode)mode inEncaps:(NSData*)inEncaps context:(ICEContext*)context response:(void(^)(BOOL, NSMutableData*))response exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent; +-(id<ICEAsyncResult>) begin_ice_invoke:(NSString*)operation mode:(ICEOperationMode)mode inEncaps:(NSData*)inEncaps context:(ICEContext*)context response:(void(^)(BOOL, NSMutableData*))response exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent; -(BOOL) end_ice_invoke:(NSMutableData**)outEncaps result:(id<ICEAsyncResult>)result; -(ICEIdentity*) ice_getIdentity; -(id) ice_identity:(ICEIdentity*)identity; diff --git a/objective-c/src/Ice/Exception.mm b/objective-c/src/Ice/Exception.mm index 38153460bea..ada067b97f4 100644 --- a/objective-c/src/Ice/Exception.mm +++ b/objective-c/src/Ice/Exception.mm @@ -31,7 +31,7 @@ -(NSString*)ice_id { - NSAssert(false, @"ice_id not overriden"); + NSAssert(false, @"ice_id not overridden"); return nil; } @@ -48,7 +48,7 @@ -(id) copyWithZone:(NSZone*)__unused zone { - NSAssert(false, @"copyWithZone: must be overriden"); + NSAssert(false, @"copyWithZone: must be overridden"); return nil; } @@ -92,7 +92,7 @@ localExceptionToString(const Ice::LocalException& ex) -(void)rethrowCxx { - NSAssert(false, @"rethrowCxx must be overriden"); + NSAssert(false, @"rethrowCxx must be overridden"); } +(id)localExceptionWithLocalException:(const Ice::LocalException&)ex diff --git a/objective-c/test/Ice/optional/OptionalTest.ice b/objective-c/test/Ice/optional/OptionalTest.ice index babfc41a668..139d95fe88c 100644 --- a/objective-c/test/Ice/optional/OptionalTest.ice +++ b/objective-c/test/Ice/optional/OptionalTest.ice @@ -70,7 +70,7 @@ dictionary<int, OneOptional*> IntOneOptionalPrxDict; class MultiOptional { optional(1) byte a; - optional(2) bool b; + optional(2) bool b; optional(3) short c; optional(4) int d; optional(5) long e; diff --git a/python/test/Ice/servantLocator/TestAMDI.py b/python/test/Ice/servantLocator/TestAMDI.py index dae02342251..df8235a6d46 100644 --- a/python/test/Ice/servantLocator/TestAMDI.py +++ b/python/test/Ice/servantLocator/TestAMDI.py @@ -128,7 +128,7 @@ class ServantLocatorI(Ice.ServantLocator): test(self._requestId == current.requestId) self._requestId = -1 - test(current.id.category == self._category or self._category == "") + test(current.id.category == self._category or self._category == "") test(current.id.name == "locate" or current.id.name == "finished") if current.id.name == "finished": diff --git a/python/test/Ice/servantLocator/TestI.py b/python/test/Ice/servantLocator/TestI.py index 0ffe602ea49..035ba60c043 100644 --- a/python/test/Ice/servantLocator/TestI.py +++ b/python/test/Ice/servantLocator/TestI.py @@ -116,7 +116,7 @@ class ServantLocatorI(Ice.ServantLocator): test(self._requestId == current.requestId) self._requestId = -1 - test(current.id.category == self._category or self._category == "") + test(current.id.category == self._category or self._category == "") test(current.id.name == "locate" or current.id.name == "finished") if current.id.name == "finished": diff --git a/scripts/Util.py b/scripts/Util.py index 9886ab28ad0..0af3ee081d8 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -92,7 +92,7 @@ class Component(object): or the mapping directory if using a source distribution. """ def getInstallDir(self, mapping, current): - raise Error("must be overriden") + raise Error("must be overridden") def getSourceDir(self): return toplevel @@ -108,7 +108,7 @@ class Component(object): return os.path.join(self.getSourceDir(), "scripts", "tests") def getPhpExtension(self, mapping, current): - raise RuntimeError("must be overriden if component provides php mapping") + raise RuntimeError("must be overridden if component provides php mapping") def getNugetPackage(self, mapping): return "zeroc.{0}.{1}".format(self.__class__.__name__.lower(), @@ -131,7 +131,7 @@ class Component(object): return self.nugetVersion[mapping] def getNugetPackageVersionFile(self, mapping): - raise RuntimeError("must be overriden if component provides C++ or C# nuget packages") + raise RuntimeError("must be overridden if component provides C++ or C# nuget packages") def getFilters(self, mapping, config): return ([], []) @@ -290,7 +290,7 @@ class Platform(object): return os.path.join(installDir, "lib") def getBuildSubDir(self, mapping, name, current): - # Return the build sub-directory, to be overriden by specializations + # Return the build sub-directory, to be overridden by specializations buildPlatform = current.driver.configs[mapping].buildPlatform buildConfig = current.driver.configs[mapping].buildConfig return os.path.join("build", buildPlatform, buildConfig) @@ -1547,7 +1547,7 @@ class TestCase(Runnable): return self.options(current) if callable(self.options) else self.options def canRun(self, current): - # Can be overriden + # Can be overridden return True def setupServerSide(self, current): diff --git a/slice/Ice/Connection.ice b/slice/Ice/Connection.ice index 580acf67cc2..10acc37411b 100644 --- a/slice/Ice/Connection.ice +++ b/slice/Ice/Connection.ice @@ -109,8 +109,8 @@ local interface CloseCallback { /** * - * This method is called by the the connection when the connection - * is closed. If the callback needs more information about the closure, + * This method is called by the connection when the connection is + * closed. If the callback needs more information about the closure, * it can call {@link Connection#throwException}. * * @param con The connection that closed. @@ -131,7 +131,7 @@ local interface HeartbeatCallback { /** * - * This method is called by the the connection when a heartbeat is + * This method is called by the connection when a heartbeat is * received from the peer. * * @param con The connection on which a heartbeat was received. diff --git a/slice/Ice/Locator.ice b/slice/Ice/Locator.ice index b77471bffc2..0d7d3ea2370 100644 --- a/slice/Ice/Locator.ice +++ b/slice/Ice/Locator.ice @@ -216,7 +216,7 @@ interface LocatorRegistry /** * - * This inferface should be implemented by services implementing the + * This interface should be implemented by services implementing the * Ice::Locator interface. It should be advertised through an Ice * object with the identity `Ice/LocatorFinder'. This allows clients * to retrieve the locator proxy with just the endpoint information of diff --git a/slice/Ice/Metrics.ice b/slice/Ice/Metrics.ice index b7d7a86269e..ed063499d56 100644 --- a/slice/Ice/Metrics.ice +++ b/slice/Ice/Metrics.ice @@ -37,7 +37,7 @@ module IceMX /** * - * A dictionnary of strings to integers. + * A dictionary of strings to integers. * **/ dictionary<string, int> StringIntDict; @@ -199,7 +199,7 @@ interface MetricsAdmin /** * * Get the metrics objects for the given metrics view. This - * returns a dictionnary of metric maps for each metrics class + * returns a dictionary of metric maps for each metrics class * configured with the view. The timestamp allows the client to * compute averages which are not dependent of the invocation * latency for this operation. diff --git a/slice/Ice/ObjectAdapter.ice b/slice/Ice/ObjectAdapter.ice index cd277c49eb5..92c4fa44da5 100644 --- a/slice/Ice/ObjectAdapter.ice +++ b/slice/Ice/ObjectAdapter.ice @@ -639,7 +639,7 @@ local interface ObjectAdapter /** * Get the Ice locator used by this object adapter. * - * @return The locator used by this object adapter, or null if no locator is + * @return The locator used by this object adapter, or null if no locator is * used by this object adapter. * * @see Locator diff --git a/slice/Ice/Router.ice b/slice/Ice/Router.ice index 1afe2ada998..911fba9ae09 100644 --- a/slice/Ice/Router.ice +++ b/slice/Ice/Router.ice @@ -80,7 +80,7 @@ interface Router /** * - * This inferface should be implemented by services implementing the + * This interface should be implemented by services implementing the * Ice::Router interface. It should be advertised through an Ice * object with the identity `Ice/RouterFinder'. This allows clients to * retrieve the router proxy with just the endpoint information of the diff --git a/slice/IceGrid/PluginFacade.ice b/slice/IceGrid/PluginFacade.ice index d83037865da..24e554124c5 100644 --- a/slice/IceGrid/PluginFacade.ice +++ b/slice/IceGrid/PluginFacade.ice @@ -46,7 +46,7 @@ local interface ReplicaGroupFilter { /** * - * Filter the the given set of adapters. + * Filter the given set of adapters. * * @param replicaGroupId The replica group ID. * @@ -79,7 +79,7 @@ local interface TypeFilter { /** * - * Filter the the given set of proxies. + * Filter the given set of proxies. * * @param type The type. * diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice index 34fd6a51130..fef8d960c58 100644 --- a/slice/IceStorm/IceStorm.ice +++ b/slice/IceStorm/IceStorm.ice @@ -392,7 +392,7 @@ interface TopicManager /** * - * This inferface is advertised by the IceStorm service through the + * This interface is advertised by the IceStorm service through the * Ice object with the identity `IceStorm/Finder'. This allows clients * to retrieve the topic manager with just the endpoint information of * the IceStorm service. diff --git a/swift/src/Ice/InputStream.swift b/swift/src/Ice/InputStream.swift index 57d354869a6..1f27e1a3dab 100644 --- a/swift/src/Ice/InputStream.swift +++ b/swift/src/Ice/InputStream.swift @@ -591,12 +591,12 @@ public extension InputStream { // top-level sequence or enclosed sequence it doesn't really matter). // // Otherwise, we are reading an enclosed sequence and we have to bump - // minSeqSize by the minimum size that this sequence will require on + // minSeqSize by the minimum size that this sequence will require on // the stream. // // The goal of this check is to ensure that when we start un-marshalling // a new sequence, we check the minimal size of this new sequence against - // the estimated remaining buffer size. This estimatation is based on + // the estimated remaining buffer size. This estimation is based on // the minimum size of the enclosing sequences, it's minSeqSize. // if startSeq == -1 || pos > (startSeq + minSeqSize) { diff --git a/swift/src/IceImpl/Connection.h b/swift/src/IceImpl/Connection.h index 36ff118e43a..40efecac956 100644 --- a/swift/src/IceImpl/Connection.h +++ b/swift/src/IceImpl/Connection.h @@ -20,7 +20,7 @@ ICEIMPL_API @interface ICEConnection : ICELocalObject -(void) flushBatchRequestsAsync:(uint8_t)compress exception:(void (^)(NSError*))exception sent:(void (^_Nullable)(bool))sent; --(BOOL) setCloseCallback:(nullable void (^)(ICEConnection*))callback error:(NSError* _Nullable * _Nullable)error; +-(BOOL) setCloseCallback:(nullable void (^)(ICEConnection*))callback error:(NSError* _Nullable * _Nullable)error; -(void) setHeartbeatCallback:(nullable void (^)(ICEConnection*))callback; -(BOOL) heartbeat:(NSError* _Nullable * _Nullable)error; -(void) heartbeatAsync:(void (^)(NSError*))exception diff --git a/swift/src/IceImpl/IceUtil.h b/swift/src/IceImpl/IceUtil.h index a528fd4086e..754db5cc47e 100644 --- a/swift/src/IceImpl/IceUtil.h +++ b/swift/src/IceImpl/IceUtil.h @@ -43,7 +43,7 @@ NS_SWIFT_NAME(registerFactories(exception:connectionInfo:endpointInfo:adminFacet error:(NSError* _Nullable * _Nullable)error; +(BOOL) stringToIdentity:(NSString*)str name:(NSString* __strong _Nonnull * _Nonnull)name - category:(NSString* __strong _Nonnull * _Nonnull)category + category:(NSString* __strong _Nonnull * _Nonnull)category error:(NSError* _Nullable * _Nullable)error NS_SWIFT_NAME(stringToIdentity(str:name:category:)); +(NSString*) identityToString:(NSString*)name diff --git a/swift/src/IceImpl/IceUtil.mm b/swift/src/IceImpl/IceUtil.mm index 86fcfae57c1..af775f53768 100644 --- a/swift/src/IceImpl/IceUtil.mm +++ b/swift/src/IceImpl/IceUtil.mm @@ -156,7 +156,7 @@ static Class<ICEAdminFacetFactory> _adminFacetFactory; +(BOOL) stringToIdentity:(NSString*)str name:(NSString* __strong _Nonnull * _Nonnull)name - category:(NSString* __strong _Nonnull * _Nonnull)category + category:(NSString* __strong _Nonnull * _Nonnull)category error:(NSError* _Nullable * _Nullable)error { try @@ -189,7 +189,7 @@ static Class<ICEAdminFacetFactory> _adminFacetFactory; +(NSString*) escapeString:(NSString *)string special:(NSString *)special - communicator:(ICECommunicator*)communicator error:(NSError *__autoreleasing _Nullable *)error + communicator:(ICECommunicator*)communicator error:(NSError *__autoreleasing _Nullable *)error { try { diff --git a/swift/test/Ice/optional/Test.ice b/swift/test/Ice/optional/Test.ice index 88defcb60b2..1394a214a85 100644 --- a/swift/test/Ice/optional/Test.ice +++ b/swift/test/Ice/optional/Test.ice @@ -72,7 +72,7 @@ dictionary<int, string> IntStringDict; class MultiOptional { optional(1) byte a; - optional(2) bool b; + optional(2) bool b; optional(3) short c; optional(4) int d; optional(5) long e; |