You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/05/22 18:51:07 UTC
[10/17] geode git commit: Cleanup BaseCommand
http://git-wip-us.apache.org/repos/asf/geode/blob/71918769/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
index 13fef02..de37040 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
@@ -45,15 +45,15 @@ public class DestroyRegion extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, callbackArgPart = null;
String regionName = null;
Object callbackArg = null;
Part eventPart = null;
StringBuffer errMessage = new StringBuffer();
- CacheServerStats stats = servConn.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ CacheServerStats stats = serverConnection.getCacheServerStats();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
@@ -61,11 +61,11 @@ public class DestroyRegion extends BaseCommand {
stats.incReadDestroyRegionRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
- eventPart = msg.getPart(1);
+ regionNamePart = clientMessage.getPart(0);
+ eventPart = clientMessage.getPart(1);
// callbackArgPart = null; (redundant assignment)
- if (msg.getNumberOfParts() > 2) {
- callbackArgPart = msg.getPart(2);
+ if (clientMessage.getNumberOfParts() > 2) {
+ callbackArgPart = clientMessage.getPart(2);
try {
callbackArg = callbackArgPart.getObject();
} catch (DistributedSystemDisconnectedException se) {
@@ -73,47 +73,46 @@ public class DestroyRegion extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"{} ignoring message of type {} from client {} because shutdown occurred during message processing.",
- servConn.getName(), MessageType.getString(msg.getMessageType()),
- servConn.getProxyID());
+ serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()),
+ serverConnection.getProxyID());
}
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(se);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(se);
return;
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
regionName = regionNamePart.getString();
if (logger.isDebugEnabled()) {
logger.debug("{}: Received destroy region request ({} bytes) from {} for region {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName);
+ serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName);
}
// Process the destroy region request
if (regionName == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.DestroyRegion_0_THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REGION_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage.append(
LocalizedStrings.DestroyRegion__THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REGION_REQUEST_IS_NULL
.toLocalizedString());
- writeErrorResponse(msg, MessageType.DESTROY_REGION_DATA_ERROR, errMessage.toString(),
- servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.DESTROY_REGION_DATA_ERROR, errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason =
LocalizedStrings.DestroyRegion_REGION_WAS_NOT_FOUND_DURING_DESTROY_REGION_REQUEST
.toLocalizedString();
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -121,45 +120,45 @@ public class DestroyRegion extends BaseCommand {
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
try {
// user needs to have data:manage on all regions in order to destory a particular region
this.securityService.authorizeDataManage();
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
RegionDestroyOperationContext destroyContext =
authzRequest.destroyRegionAuthorize(regionName, callbackArg);
callbackArg = destroyContext.getCallbackArg();
}
// region.destroyRegion(callbackArg);
- region.basicBridgeDestroyRegion(callbackArg, servConn.getProxyID(),
+ region.basicBridgeDestroyRegion(callbackArg, serverConnection.getProxyID(),
true /* boolean from cache Client */, eventId);
} catch (DistributedSystemDisconnectedException e) {
// FIXME better exception hierarchy would avoid this check
- if (servConn.getCachedRegionHelper().getCache().getCancelCriterion()
- .cancelInProgress() != null) {
+ if (serverConnection.getCachedRegionHelper().getCache().getCancelCriterion()
+ .cancelInProgress() != null) {
if (logger.isDebugEnabled()) {
logger.debug(
"{} ignoring message of type {} from client {} because shutdown occurred during message processing.",
- servConn.getName(), MessageType.getString(msg.getMessageType()),
- servConn.getProxyID());
+ serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()),
+ serverConnection.getProxyID());
}
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(e);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(e);
} else {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
return;
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// Otherwise, write an exception message and continue
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -169,10 +168,10 @@ public class DestroyRegion extends BaseCommand {
start = DistributionStats.getStatTime();
stats.incProcessDestroyRegionTime(start - oldStart);
}
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent destroy region response for region {}", servConn.getName(),
+ logger.debug("{}: Sent destroy region response for region {}", serverConnection.getName(),
regionName);
}
stats.incWriteDestroyRegionResponseTime(DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/71918769/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
index e63ac22..1d0fc8c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
@@ -64,21 +64,21 @@ public class ExecuteFunction extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException {
Object function = null;
Object args = null;
MemberMappedArgument memberMappedArg = null;
byte hasResult = 0;
try {
- hasResult = msg.getPart(0).getSerializedForm()[0];
+ hasResult = clientMessage.getPart(0).getSerializedForm()[0];
if (hasResult == 1) {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- function = msg.getPart(1).getStringOrObject();
- args = msg.getPart(2).getObject();
+ function = clientMessage.getPart(1).getStringOrObject();
+ args = clientMessage.getPart(2).getObject();
- Part part = msg.getPart(3);
+ Part part = clientMessage.getPart(3);
if (part != null) {
memberMappedArg = (MemberMappedArgument) part.getObject();
}
@@ -87,7 +87,7 @@ public class ExecuteFunction extends BaseCommand {
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -97,7 +97,7 @@ public class ExecuteFunction extends BaseCommand {
LocalizedStrings.ExecuteFunction_THE_INPUT_FUNCTION_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString();
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -110,7 +110,7 @@ public class ExecuteFunction extends BaseCommand {
final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
} else {
@@ -129,7 +129,7 @@ public class ExecuteFunction extends BaseCommand {
args, functionObject.optimizeForWrite());
}
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
ResultSender resultSender = new ServerToClientFunctionResultSender(m,
MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -182,7 +182,7 @@ public class ExecuteFunction extends BaseCommand {
function), ioException);
String message =
LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioException);
+ sendException(hasResult, clientMessage, message, servConn, ioException);
} catch (InternalFunctionInvocationTargetException internalfunctionException) {
// Fix for #44709: User should not be aware of
// InternalFunctionInvocationTargetException. No instance of
@@ -200,20 +200,20 @@ public class ExecuteFunction extends BaseCommand {
new Object[] {function}), internalfunctionException);
}
final String message = internalfunctionException.getMessage();
- sendException(hasResult, msg, message, servConn, internalfunctionException);
+ sendException(hasResult, clientMessage, message, servConn, internalfunctionException);
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
final String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
}
}
private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
Throwable e) throws IOException {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e);
servConn.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/71918769/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
index 8fafd10..4a0a993 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
@@ -63,7 +63,7 @@ public class ExecuteFunction65 extends BaseCommand {
ExecuteFunction65() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException {
Object function = null;
Object args = null;
MemberMappedArgument memberMappedArg = null;
@@ -71,7 +71,7 @@ public class ExecuteFunction65 extends BaseCommand {
byte functionState = 0;
boolean isReexecute = false;
try {
- functionState = msg.getPart(0).getSerializedForm()[0];
+ functionState = clientMessage.getPart(0).getSerializedForm()[0];
if (functionState == AbstractExecution.HA_HASRESULT_NO_OPTIMIZEFORWRITE_REEXECUTE) {
functionState = AbstractExecution.HA_HASRESULT_NO_OPTIMIZEFORWRITE;
@@ -90,10 +90,10 @@ public class ExecuteFunction65 extends BaseCommand {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- function = msg.getPart(1).getStringOrObject();
- args = msg.getPart(2).getObject();
+ function = clientMessage.getPart(1).getStringOrObject();
+ args = clientMessage.getPart(2).getObject();
- Part part = msg.getPart(3);
+ Part part = clientMessage.getPart(3);
if (part != null) {
memberMappedArg = (MemberMappedArgument) part.getObject();
}
@@ -102,7 +102,7 @@ public class ExecuteFunction65 extends BaseCommand {
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -112,7 +112,7 @@ public class ExecuteFunction65 extends BaseCommand {
LocalizedStrings.ExecuteFunction_THE_INPUT_FUNCTION_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString();
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -125,7 +125,7 @@ public class ExecuteFunction65 extends BaseCommand {
final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -139,7 +139,7 @@ public class ExecuteFunction65 extends BaseCommand {
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
}
@@ -159,7 +159,7 @@ public class ExecuteFunction65 extends BaseCommand {
args, functionObject.optimizeForWrite());
}
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
ResultSender resultSender = new ServerToClientFunctionResultSender65(m,
MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -193,7 +193,7 @@ public class ExecuteFunction65 extends BaseCommand {
.toLocalizedString(new Object[] {functionObject.getId(), sm}),
sm);
- sendException(hasResult, msg, e.getMessage(), servConn, e);
+ sendException(hasResult, clientMessage, e.getMessage(), servConn, e);
return;
}
functionObject.execute(context);
@@ -220,7 +220,7 @@ public class ExecuteFunction65 extends BaseCommand {
function), ioException);
String message =
LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioException);
+ sendException(hasResult, clientMessage, message, servConn, ioException);
} catch (InternalFunctionInvocationTargetException internalfunctionException) {
// Fix for #44709: User should not be aware of
// InternalFunctionInvocationTargetException. No instance of
@@ -236,20 +236,20 @@ public class ExecuteFunction65 extends BaseCommand {
new Object[] {function}), internalfunctionException);
}
final String message = internalfunctionException.getMessage();
- sendException(hasResult, msg, message, servConn, internalfunctionException);
+ sendException(hasResult, clientMessage, message, servConn, internalfunctionException);
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
final String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
}
}
private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
Throwable e) throws IOException {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e);
servConn.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/71918769/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
index d007777..f4aac7a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
@@ -87,7 +87,7 @@ public class ExecuteFunction66 extends BaseCommand {
ExecuteFunction66() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException {
Object function = null;
Object args = null;
MemberMappedArgument memberMappedArg = null;
@@ -99,7 +99,7 @@ public class ExecuteFunction66 extends BaseCommand {
boolean ignoreFailedMembers = false;
int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT;
try {
- byte[] bytes = msg.getPart(0).getSerializedForm();
+ byte[] bytes = clientMessage.getPart(0).getSerializedForm();
functionState = bytes[0];
if (bytes.length >= 5
&& servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
@@ -123,25 +123,25 @@ public class ExecuteFunction66 extends BaseCommand {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- function = msg.getPart(1).getStringOrObject();
- args = msg.getPart(2).getObject();
+ function = clientMessage.getPart(1).getStringOrObject();
+ args = clientMessage.getPart(2).getObject();
- Part part = msg.getPart(3);
+ Part part = clientMessage.getPart(3);
if (part != null) {
memberMappedArg = (MemberMappedArgument) part.getObject();
}
- groups = getGroups(msg);
- allMembers = getAllMembers(msg);
- ignoreFailedMembers = getIgnoreFailedMembers(msg);
+ groups = getGroups(clientMessage);
+ allMembers = getAllMembers(clientMessage);
+ ignoreFailedMembers = getIgnoreFailedMembers(clientMessage);
} catch (ClassNotFoundException exception) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
} else {
- writeException(msg, exception, false, servConn);
+ writeException(clientMessage, exception, false, servConn);
}
servConn.setAsTrue(RESPONDED);
return;
@@ -153,7 +153,7 @@ public class ExecuteFunction66 extends BaseCommand {
.toLocalizedString();
logger.warn(LocalizedMessage.create(LocalizedStrings.TWO_ARG_COLON,
new Object[] {servConn.getName(), message}));
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -166,7 +166,7 @@ public class ExecuteFunction66 extends BaseCommand {
final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -180,7 +180,7 @@ public class ExecuteFunction66 extends BaseCommand {
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
}
@@ -200,7 +200,7 @@ public class ExecuteFunction66 extends BaseCommand {
args, functionObject.optimizeForWrite());
}
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
ServerToClientFunctionResultSender resultSender = new ServerToClientFunctionResultSender65(m,
MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -232,7 +232,7 @@ public class ExecuteFunction66 extends BaseCommand {
.toLocalizedString(new Object[] {functionObject.getId(), sm}),
sm);
- sendException(hasResult, msg, e.getMessage(), servConn, e);
+ sendException(hasResult, clientMessage, e.getMessage(), servConn, e);
return;
}
/**
@@ -252,7 +252,7 @@ public class ExecuteFunction66 extends BaseCommand {
}
if (!functionObject.hasResult()) {
- writeReply(msg, servConn);
+ writeReply(clientMessage, servConn);
}
} catch (FunctionException functionException) {
stats.endFunctionExecutionWithException(functionObject.hasResult());
@@ -269,7 +269,7 @@ public class ExecuteFunction66 extends BaseCommand {
function), ioException);
String message =
LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioException);
+ sendException(hasResult, clientMessage, message, servConn, ioException);
} catch (InternalFunctionInvocationTargetException internalfunctionException) {
// Fix for #44709: User should not be aware of
// InternalFunctionInvocationTargetException. No instance of
@@ -287,13 +287,13 @@ public class ExecuteFunction66 extends BaseCommand {
new Object[] {function}), internalfunctionException);
}
final String message = internalfunctionException.getMessage();
- sendException(hasResult, msg, message, servConn, internalfunctionException);
+ sendException(hasResult, clientMessage, message, servConn, internalfunctionException);
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
final String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
}
}
@@ -399,7 +399,7 @@ public class ExecuteFunction66 extends BaseCommand {
private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
Throwable e) throws IOException {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e);
} else {
writeException(msg, e, false, servConn);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/71918769/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
index 957b423..bf5f70b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
@@ -51,8 +51,8 @@ public class ExecuteFunction70 extends ExecuteFunction66 {
private ExecuteFunction70() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- super.cmdExecute(msg, servConn, start);
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException {
+ super.cmdExecute(clientMessage, serverConnection, start);
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/71918769/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
index 0007dab..3147fe5 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
@@ -63,7 +63,7 @@ public class ExecuteRegionFunction extends BaseCommand {
private ExecuteRegionFunction() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException {
String regionName = null;
Object function = null;
Object args = null;
@@ -73,27 +73,27 @@ public class ExecuteRegionFunction extends BaseCommand {
int filterSize = 0, partNumber = 0;
CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
try {
- hasResult = msg.getPart(0).getSerializedForm()[0];
+ hasResult = clientMessage.getPart(0).getSerializedForm()[0];
if (hasResult == 1) {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- regionName = msg.getPart(1).getString();
- function = msg.getPart(2).getStringOrObject();
- args = msg.getPart(3).getObject();
- Part part = msg.getPart(4);
+ regionName = clientMessage.getPart(1).getString();
+ function = clientMessage.getPart(2).getStringOrObject();
+ args = clientMessage.getPart(3).getObject();
+ Part part = clientMessage.getPart(4);
if (part != null) {
Object obj = part.getObject();
if (obj instanceof MemberMappedArgument) {
memberMappedArg = (MemberMappedArgument) obj;
}
}
- filterSize = msg.getPart(5).getInt();
+ filterSize = clientMessage.getPart(5).getInt();
if (filterSize != 0) {
filter = new HashSet();
partNumber = 6;
for (int i = 0; i < filterSize; i++) {
- filter.add(msg.getPart(partNumber + i).getStringOrObject());
+ filter.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
@@ -102,7 +102,7 @@ public class ExecuteRegionFunction extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -120,7 +120,7 @@ public class ExecuteRegionFunction extends BaseCommand {
.toLocalizedString("region");
}
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -130,7 +130,7 @@ public class ExecuteRegionFunction extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -147,7 +147,7 @@ public class ExecuteRegionFunction extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
} else {
@@ -169,7 +169,7 @@ public class ExecuteRegionFunction extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender(m,
MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -204,7 +204,7 @@ public class ExecuteRegionFunction extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, servConn, ioe);
} catch (InternalFunctionInvocationTargetException internalfunctionException) {
// Fix for #44709: User should not be aware of
// InternalFunctionInvocationTargetException. No instance of
@@ -222,20 +222,20 @@ public class ExecuteRegionFunction extends BaseCommand {
new Object[] {function}), internalfunctionException);
}
final String message = internalfunctionException.getMessage();
- sendException(hasResult, msg, message, servConn, internalfunctionException);
+ sendException(hasResult, clientMessage, message, servConn, internalfunctionException);
} catch (FunctionException fe) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
String message = fe.getMessage();
- sendException(hasResult, msg, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, servConn, fe);
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
}
@@ -245,7 +245,7 @@ public class ExecuteRegionFunction extends BaseCommand {
Throwable e) throws IOException {
synchronized (msg) {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e);
servConn.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/71918769/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
index b1d3d4e..73ab621 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
@@ -63,7 +63,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
private ExecuteRegionFunction61() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException {
String regionName = null;
Object function = null;
Object args = null;
@@ -76,40 +76,40 @@ public class ExecuteRegionFunction61 extends BaseCommand {
int filterSize = 0, partNumber = 0;
CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
try {
- hasResult = msg.getPart(0).getSerializedForm()[0];
+ hasResult = clientMessage.getPart(0).getSerializedForm()[0];
if (hasResult == 1) {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- regionName = msg.getPart(1).getString();
- function = msg.getPart(2).getStringOrObject();
- args = msg.getPart(3).getObject();
- Part part = msg.getPart(4);
+ regionName = clientMessage.getPart(1).getString();
+ function = clientMessage.getPart(2).getStringOrObject();
+ args = clientMessage.getPart(3).getObject();
+ Part part = clientMessage.getPart(4);
if (part != null) {
Object obj = part.getObject();
if (obj instanceof MemberMappedArgument) {
memberMappedArg = (MemberMappedArgument) obj;
}
}
- isReExecute = msg.getPart(5).getSerializedForm()[0];
- filterSize = msg.getPart(6).getInt();
+ isReExecute = clientMessage.getPart(5).getSerializedForm()[0];
+ filterSize = clientMessage.getPart(6).getInt();
if (filterSize != 0) {
filter = new HashSet();
partNumber = 7;
for (int i = 0; i < filterSize; i++) {
- filter.add(msg.getPart(partNumber + i).getStringOrObject());
+ filter.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
partNumber = 7 + filterSize;
- removedNodesSize = msg.getPart(partNumber).getInt();
+ removedNodesSize = clientMessage.getPart(partNumber).getInt();
if (removedNodesSize != 0) {
removedNodesSet = new HashSet();
partNumber = partNumber + 1;
for (int i = 0; i < removedNodesSize; i++) {
- removedNodesSet.add(msg.getPart(partNumber + i).getStringOrObject());
+ removedNodesSet.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
@@ -118,7 +118,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -136,7 +136,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
.toLocalizedString("region");
}
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
Region region = crHelper.getRegion(regionName);
@@ -145,7 +145,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
HandShake handShake = (HandShake) servConn.getHandshake();
@@ -161,7 +161,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
} else {
@@ -180,7 +180,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender(m,
MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -220,7 +220,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
final String message =
LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, servConn, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
@@ -255,7 +255,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, msg, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, servConn, fe);
}
} catch (Exception e) {
@@ -263,7 +263,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
}
finally {
@@ -275,7 +275,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
Throwable e) throws IOException {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e);
servConn.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/71918769/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
index 57bc869..f1540f9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
@@ -60,7 +60,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
private ExecuteRegionFunction65() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException {
String regionName = null;
Object function = null;
Object args = null;
@@ -74,7 +74,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
byte functionState = 0;
try {
- functionState = msg.getPart(0).getSerializedForm()[0];
+ functionState = clientMessage.getPart(0).getSerializedForm()[0];
if (functionState != 1) {
hasResult = (byte) ((functionState & 2) - 1);
} else {
@@ -84,35 +84,35 @@ public class ExecuteRegionFunction65 extends BaseCommand {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- regionName = msg.getPart(1).getString();
- function = msg.getPart(2).getStringOrObject();
- args = msg.getPart(3).getObject();
- Part part = msg.getPart(4);
+ regionName = clientMessage.getPart(1).getString();
+ function = clientMessage.getPart(2).getStringOrObject();
+ args = clientMessage.getPart(3).getObject();
+ Part part = clientMessage.getPart(4);
if (part != null) {
Object obj = part.getObject();
if (obj instanceof MemberMappedArgument) {
memberMappedArg = (MemberMappedArgument) obj;
}
}
- isReExecute = msg.getPart(5).getSerializedForm()[0];
- filterSize = msg.getPart(6).getInt();
+ isReExecute = clientMessage.getPart(5).getSerializedForm()[0];
+ filterSize = clientMessage.getPart(6).getInt();
if (filterSize != 0) {
filter = new HashSet<Object>();
partNumber = 7;
for (int i = 0; i < filterSize; i++) {
- filter.add(msg.getPart(partNumber + i).getStringOrObject());
+ filter.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
partNumber = 7 + filterSize;
- removedNodesSize = msg.getPart(partNumber).getInt();
+ removedNodesSize = clientMessage.getPart(partNumber).getInt();
if (removedNodesSize != 0) {
removedNodesSet = new HashSet<Object>();
partNumber = partNumber + 1;
for (int i = 0; i < removedNodesSize; i++) {
- removedNodesSet.add(msg.getPart(partNumber + i).getStringOrObject());
+ removedNodesSet.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
@@ -121,7 +121,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -139,7 +139,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
.toLocalizedString("region");
}
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -149,7 +149,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -166,7 +166,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -180,7 +180,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
}
@@ -203,7 +203,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender65(m,
MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -262,7 +262,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, servConn, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
@@ -298,7 +298,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, msg, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, servConn, fe);
}
} catch (Exception e) {
@@ -306,7 +306,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/71918769/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
index 0ed7235..25d69d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
@@ -64,7 +64,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
private ExecuteRegionFunction66() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException {
String regionName = null;
Object function = null;
Object args = null;
@@ -80,7 +80,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
byte functionState = 0;
int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT;
try {
- byte[] bytes = msg.getPart(0).getSerializedForm();
+ byte[] bytes = clientMessage.getPart(0).getSerializedForm();
functionState = bytes[0];
if (bytes.length >= 5
&& servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
@@ -95,17 +95,17 @@ public class ExecuteRegionFunction66 extends BaseCommand {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- regionName = msg.getPart(1).getString();
- function = msg.getPart(2).getStringOrObject();
- args = msg.getPart(3).getObject();
- Part part = msg.getPart(4);
+ regionName = clientMessage.getPart(1).getString();
+ function = clientMessage.getPart(2).getStringOrObject();
+ args = clientMessage.getPart(3).getObject();
+ Part part = clientMessage.getPart(4);
if (part != null) {
Object obj = part.getObject();
if (obj instanceof MemberMappedArgument) {
memberMappedArg = (MemberMappedArgument) obj;
}
}
- byte[] flags = msg.getPart(5).getSerializedForm();
+ byte[] flags = clientMessage.getPart(5).getSerializedForm();
if (servConn.getClientVersion().ordinal() > Version.GFE_81.ordinal()) {
isBucketsAsFilter = (flags[0] & ExecuteFunctionHelper.BUCKETS_AS_FILTER_MASK) != 0;
isReExecute = (flags[0] & ExecuteFunctionHelper.IS_REXECUTE_MASK) != 0 ? (byte) 1 : 0;
@@ -113,24 +113,24 @@ public class ExecuteRegionFunction66 extends BaseCommand {
isReExecute = flags[0];
isBucketsAsFilter = false;
}
- filterSize = msg.getPart(6).getInt();
+ filterSize = clientMessage.getPart(6).getInt();
if (filterSize != 0) {
filter = new HashSet<Object>();
partNumber = 7;
for (int i = 0; i < filterSize; i++) {
- filter.add(msg.getPart(partNumber + i).getStringOrObject());
+ filter.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
partNumber = 7 + filterSize;
- removedNodesSize = msg.getPart(partNumber).getInt();
+ removedNodesSize = clientMessage.getPart(partNumber).getInt();
if (removedNodesSize != 0) {
removedNodesSet = new HashSet<Object>();
partNumber = partNumber + 1;
for (int i = 0; i < removedNodesSize; i++) {
- removedNodesSet.add(msg.getPart(partNumber + i).getStringOrObject());
+ removedNodesSet.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
@@ -139,9 +139,9 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
} else {
- writeException(msg, exception, false, servConn);
+ writeException(clientMessage, exception, false, servConn);
}
servConn.setAsTrue(RESPONDED);
return;
@@ -159,7 +159,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
.toLocalizedString("region");
}
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -169,7 +169,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
HandShake handShake = (HandShake) servConn.getHandshake();
@@ -185,7 +185,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -199,7 +199,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
}
@@ -222,7 +222,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender65(m,
MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -276,7 +276,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
} else {
execution.execute(functionObject);
}
- writeReply(msg, servConn);
+ writeReply(clientMessage, servConn);
}
} catch (IOException ioe) {
logger.warn(LocalizedMessage.create(
@@ -284,7 +284,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, servConn, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
Object cause = fe.getCause();
@@ -321,7 +321,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, msg, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, servConn, fe);
}
} catch (Exception e) {
@@ -329,7 +329,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
ServerConnection.executeFunctionOnLocalNodeOnly((byte) 0);
http://git-wip-us.apache.org/repos/asf/geode/blob/71918769/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
index 8b2cf75..725f03b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
@@ -62,7 +62,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
private ExecuteRegionFunctionSingleHop() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException {
String regionName = null;
Object function = null;
@@ -79,7 +79,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT;
try {
- byte[] bytes = msg.getPart(0).getSerializedForm();
+ byte[] bytes = clientMessage.getPart(0).getSerializedForm();
functionState = bytes[0];
if (bytes.length >= 5
&& servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
@@ -94,49 +94,49 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- regionName = msg.getPart(1).getString();
- function = msg.getPart(2).getStringOrObject();
- args = msg.getPart(3).getObject();
- Part part = msg.getPart(4);
+ regionName = clientMessage.getPart(1).getString();
+ function = clientMessage.getPart(2).getStringOrObject();
+ args = clientMessage.getPart(3).getObject();
+ Part part = clientMessage.getPart(4);
if (part != null) {
Object obj = part.getObject();
if (obj instanceof MemberMappedArgument) {
memberMappedArg = (MemberMappedArgument) obj;
}
}
- isExecuteOnAllBuckets = msg.getPart(5).getSerializedForm()[0];
+ isExecuteOnAllBuckets = clientMessage.getPart(5).getSerializedForm()[0];
if (isExecuteOnAllBuckets == 1) {
filter = new HashSet();
- bucketIdsSize = msg.getPart(6).getInt();
+ bucketIdsSize = clientMessage.getPart(6).getInt();
if (bucketIdsSize != 0) {
buckets = new HashSet<Integer>();
partNumber = 7;
for (int i = 0; i < bucketIdsSize; i++) {
- buckets.add(msg.getPart(partNumber + i).getInt());
+ buckets.add(clientMessage.getPart(partNumber + i).getInt());
}
}
partNumber = 7 + bucketIdsSize;
} else {
- filterSize = msg.getPart(6).getInt();
+ filterSize = clientMessage.getPart(6).getInt();
if (filterSize != 0) {
filter = new HashSet<Object>();
partNumber = 7;
for (int i = 0; i < filterSize; i++) {
- filter.add(msg.getPart(partNumber + i).getStringOrObject());
+ filter.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
partNumber = 7 + filterSize;
}
- removedNodesSize = msg.getPart(partNumber).getInt();
+ removedNodesSize = clientMessage.getPart(partNumber).getInt();
if (removedNodesSize != 0) {
removedNodesSet = new HashSet<Object>();
partNumber = partNumber + 1;
for (int i = 0; i < removedNodesSize; i++) {
- removedNodesSet.add(msg.getPart(partNumber + i).getStringOrObject());
+ removedNodesSet.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
@@ -145,7 +145,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -163,7 +163,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
.toLocalizedString("region");
}
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -173,7 +173,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
HandShake handShake = (HandShake) servConn.getHandshake();
@@ -189,7 +189,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
byte functionStateOnServer = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -199,7 +199,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
}
@@ -222,7 +222,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender65(m,
MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -290,7 +290,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, servConn, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
@@ -301,21 +301,21 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
logger.debug("Exception on server while executing function: {}: {}", function, message,
fe);
}
- synchronized (msg) {
+ synchronized (clientMessage) {
resultSender.setException(fe);
}
} else {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, msg, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, servConn, fe);
}
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
ServerConnection.executeFunctionOnLocalNodeOnly((byte) 0);