Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
pepone committed Sep 27, 2024
1 parent b5fa866 commit 4d4270b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions cpp/include/Ice/Proxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ namespace Ice

/**
* Obtains a proxy that is identical to this proxy, except for the invocation timeout.
* @param timeout The new invocation timeout (in milliseconds).
* @param timeout The new invocation timeout.
* @return A proxy with the new timeout.
*/
template<class Rep, class Period>
Expand Down Expand Up @@ -205,7 +205,7 @@ namespace Ice

/**
* Obtains a proxy that is identical to this proxy, except for the locator cache timeout.
* @param timeout The new locator cache timeout (in seconds).
* @param timeout The new locator cache timeout.
* @return A proxy with the new timeout.
*/
template<class Rep, class Period>
Expand Down
10 changes: 4 additions & 6 deletions cpp/src/Ice/ReferenceFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -855,9 +855,8 @@ IceInternal::ReferenceFactory::create(
property = propertyPrefix + ".LocatorCacheTimeout";
if (!properties->getProperty(property).empty())
{
int locatorCacheTimeoutValue = properties->getPropertyAsIntWithDefault(
property,
static_cast<int32_t>(locatorCacheTimeout.count()));
int locatorCacheTimeoutValue =
properties->getPropertyAsIntWithDefault(property, static_cast<int32_t>(locatorCacheTimeout.count()));
if (locatorCacheTimeoutValue < -1)
{
locatorCacheTimeoutValue = -1;
Expand All @@ -872,9 +871,8 @@ IceInternal::ReferenceFactory::create(
property = propertyPrefix + ".InvocationTimeout";
if (!properties->getProperty(property).empty())
{
int invocationTimeoutValue = properties->getPropertyAsIntWithDefault(
property,
static_cast<int32_t>(invocationTimeout.count()));
int invocationTimeoutValue =
properties->getPropertyAsIntWithDefault(property, static_cast<int32_t>(invocationTimeout.count()));
if (invocationTimeoutValue < 1 && invocationTimeoutValue != -1)
{
invocationTimeoutValue = -1;
Expand Down
2 changes: 1 addition & 1 deletion matlab/src/ObjectPrx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ extern "C"
mxArray* Ice_ObjectPrx_ice_getInvocationTimeout(void* self)
{
chrono::milliseconds timeout = restoreProxy(self)->ice_getInvocationTimeout();
return createResultValue(createInt(static_cast<int32_t>>(timeout.count())));
return createResultValue(createInt(static_cast<int32_t>(timeout.count())));
}

mxArray* Ice_ObjectPrx_ice_invocationTimeout(void* self, void** r, int t)
Expand Down

0 comments on commit 4d4270b

Please sign in to comment.