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/06/01 17:35:34 UTC
[3/4] geode git commit: Fix issues
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/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 30d122f..1c928ee 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
@@ -73,7 +73,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
int removedNodesSize = 0;
Set<Object> removedNodesSet = null;
int filterSize = 0, partNumber = 0;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
byte functionState = 0;
try {
functionState = clientMessage.getPart(0).getSerializedForm()[0];
@@ -83,8 +83,8 @@ public class ExecuteRegionFunction65 extends BaseCommand {
hasResult = functionState;
}
if (hasResult == 1) {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
regionName = clientMessage.getPart(1).getString();
function = clientMessage.getPart(2).getStringOrObject();
@@ -123,8 +123,8 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(clientMessage, exception, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, exception, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -140,8 +140,8 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString("region");
}
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
@@ -150,12 +150,12 @@ public class ExecuteRegionFunction65 extends BaseCommand {
String message =
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
- HandShake handShake = (HandShake) servConn.getHandshake();
+ HandShake handShake = (HandShake) serverConnection.getHandshake();
int earlierClientReadTimeout = handShake.getClientReadTimeout();
handShake.setClientReadTimeout(0);
ServerToClientFunctionResultSender resultSender = null;
@@ -167,8 +167,8 @@ public class ExecuteRegionFunction65 extends BaseCommand {
String message =
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -181,8 +181,8 @@ public class ExecuteRegionFunction65 extends BaseCommand {
String message =
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
}
@@ -190,10 +190,10 @@ public class ExecuteRegionFunction65 extends BaseCommand {
functionObject = (Function) function;
}
- this.securityService.authorizeDataWrite();
+ securityService.authorizeDataWrite();
// check if the caller is authorized to do this operation on server
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
final String functionName = functionObject.getId();
final String regionPath = region.getFullPath();
ExecuteFunctionOperationContext executeContext = null;
@@ -204,10 +204,10 @@ public class ExecuteRegionFunction65 extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
- ChunkedMessage m = servConn.getFunctionResponseMessage();
+ ChunkedMessage m = serverConnection.getFunctionResponseMessage();
m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender65(m,
- MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
+ MessageType.EXECUTE_REGION_FUNCTION_RESULT, serverConnection, functionObject, executeContext);
if (execution instanceof PartitionedRegionFunctionExecutor) {
@@ -223,7 +223,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"Executing Function: {} on Server: {} with Execution: {} functionState={} reexecute={} hasResult={}",
- functionObject.getId(), servConn, execution, functionState, isReExecute, hasResult);
+ functionObject.getId(), serverConnection, execution, functionState, isReExecute, hasResult);
}
if (hasResult == 1) {
if (function instanceof String) {
@@ -264,7 +264,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, clientMessage, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, serverConnection, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
@@ -300,7 +300,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, clientMessage, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, serverConnection, fe);
}
} catch (Exception e) {
@@ -308,37 +308,37 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, clientMessage, message, servConn, e);
+ sendException(hasResult, clientMessage, message, serverConnection, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
}
}
- private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
+ private void sendException(byte hasResult, Message msg, String message, ServerConnection serverConnection,
Throwable e) throws IOException {
synchronized (msg) {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
- servConn.setAsTrue(RESPONDED);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, message, serverConnection, e);
+ serverConnection.setAsTrue(RESPONDED);
}
}
}
- private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn)
+ private void sendError(byte hasResult, Message msg, String message, ServerConnection serverConnection)
throws IOException {
synchronized (msg) {
if (hasResult == 1) {
writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message,
- servConn);
- servConn.setAsTrue(RESPONDED);
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
}
protected static void writeFunctionResponseException(Message origMsg, int messageType,
- String message, ServerConnection servConn, Throwable e) throws IOException {
- ChunkedMessage functionResponseMsg = servConn.getFunctionResponseMessage();
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ String message, ServerConnection serverConnection, Throwable e) throws IOException {
+ ChunkedMessage functionResponseMsg = serverConnection.getFunctionResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
int numParts = 0;
if (functionResponseMsg.headerHasBeenSent()) {
if (e instanceof FunctionException
@@ -357,13 +357,13 @@ public class ExecuteRegionFunction65 extends BaseCommand {
numParts = 2;
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk while reply in progress: ", servConn.getName(),
+ logger.debug("{}: Sending exception chunk while reply in progress: ", serverConnection.getName(),
e);
}
- functionResponseMsg.setServerConnection(servConn);
+ functionResponseMsg.setServerConnection(serverConnection);
functionResponseMsg.setLastChunkAndNumParts(true, numParts);
// functionResponseMsg.setLastChunk(true);
- functionResponseMsg.sendChunk(servConn);
+ functionResponseMsg.sendChunk(serverConnection);
} else {
chunkedResponseMsg.setMessageType(messageType);
chunkedResponseMsg.setTransactionId(origMsg.getTransactionId());
@@ -384,11 +384,11 @@ public class ExecuteRegionFunction65 extends BaseCommand {
numParts = 2;
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk: ", servConn.getName(), e);
+ logger.debug("{}: Sending exception chunk: ", serverConnection.getName(), e);
}
- chunkedResponseMsg.setServerConnection(servConn);
+ chunkedResponseMsg.setServerConnection(serverConnection);
chunkedResponseMsg.setLastChunkAndNumParts(true, numParts);
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/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 8a3f451..ec5c161 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
@@ -78,14 +78,14 @@ public class ExecuteRegionFunction66 extends BaseCommand {
int removedNodesSize = 0;
Set<Object> removedNodesSet = null;
int filterSize = 0, partNumber = 0;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
byte functionState = 0;
int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT;
try {
byte[] bytes = clientMessage.getPart(0).getSerializedForm();
functionState = bytes[0];
if (bytes.length >= 5
- && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
+ && serverConnection.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
functionTimeout = Part.decodeInt(bytes, 1);
}
if (functionState != 1) {
@@ -94,8 +94,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
hasResult = functionState;
}
if (hasResult == 1) {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
regionName = clientMessage.getPart(1).getString();
function = clientMessage.getPart(2).getStringOrObject();
@@ -108,7 +108,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
}
}
byte[] flags = clientMessage.getPart(5).getSerializedForm();
- if (servConn.getClientVersion().ordinal() > Version.GFE_81.ordinal()) {
+ if (serverConnection.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;
} else {
@@ -141,11 +141,11 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(clientMessage, exception, servConn);
+ writeChunkedException(clientMessage, exception, serverConnection);
} else {
- writeException(clientMessage, exception, false, servConn);
+ writeException(clientMessage, exception, false, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (function == null || regionName == null) {
@@ -160,8 +160,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString("region");
}
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
@@ -170,11 +170,11 @@ public class ExecuteRegionFunction66 extends BaseCommand {
String message =
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
- HandShake handShake = (HandShake) servConn.getHandshake();
+ HandShake handShake = (HandShake) serverConnection.getHandshake();
int earlierClientReadTimeout = handShake.getClientReadTimeout();
handShake.setClientReadTimeout(functionTimeout);
ServerToClientFunctionResultSender resultSender = null;
@@ -186,8 +186,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
String message =
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -200,8 +200,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
String message =
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
}
@@ -209,10 +209,10 @@ public class ExecuteRegionFunction66 extends BaseCommand {
functionObject = (Function) function;
}
- this.securityService.authorizeDataWrite();
+ securityService.authorizeDataWrite();
// check if the caller is authorized to do this operation on server
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
final String functionName = functionObject.getId();
final String regionPath = region.getFullPath();
ExecuteFunctionOperationContext executeContext = null;
@@ -223,10 +223,10 @@ public class ExecuteRegionFunction66 extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
- ChunkedMessage m = servConn.getFunctionResponseMessage();
+ ChunkedMessage m = serverConnection.getFunctionResponseMessage();
m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender65(m,
- MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
+ MessageType.EXECUTE_REGION_FUNCTION_RESULT, serverConnection, functionObject, executeContext);
if (execution instanceof PartitionedRegionFunctionExecutor) {
if ((hasResult == 1) && filter != null && filter.size() == 1) {
@@ -244,7 +244,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"Executing Function: {} on Server: {} with Execution: {} functionState={} reExecute={} hasResult={}",
- functionObject.getId(), servConn, execution, functionState, isReExecute, hasResult);
+ functionObject.getId(), serverConnection, execution, functionState, isReExecute, hasResult);
}
if (hasResult == 1) {
if (function instanceof String) {
@@ -278,7 +278,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
} else {
execution.execute(functionObject);
}
- writeReply(clientMessage, servConn);
+ writeReply(clientMessage, serverConnection);
}
} catch (IOException ioe) {
logger.warn(LocalizedMessage.create(
@@ -286,7 +286,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, clientMessage, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, serverConnection, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
Object cause = fe.getCause();
@@ -323,7 +323,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, clientMessage, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, serverConnection, fe);
}
} catch (Exception e) {
@@ -331,42 +331,42 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, clientMessage, message, servConn, e);
+ sendException(hasResult, clientMessage, message, serverConnection, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
ServerConnection.executeFunctionOnLocalNodeOnly((byte) 0);
}
}
- private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
+ private void sendException(byte hasResult, Message msg, String message, ServerConnection serverConnection,
Throwable e) throws IOException {
synchronized (msg) {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, message, serverConnection, e);
} else {
- writeException(msg, e, false, servConn);
+ writeException(msg, e, false, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
}
- private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn)
+ private void sendError(byte hasResult, Message msg, String message, ServerConnection serverConnection)
throws IOException {
synchronized (msg) {
if (hasResult == 1) {
writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message,
- servConn);
+ serverConnection);
} else {
- writeErrorResponse(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, servConn);
+ writeErrorResponse(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
}
protected static void writeFunctionResponseException(Message origMsg, int messageType,
- String message, ServerConnection servConn, Throwable e) throws IOException {
- ChunkedMessage functionResponseMsg = servConn.getFunctionResponseMessage();
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ String message, ServerConnection serverConnection, Throwable e) throws IOException {
+ ChunkedMessage functionResponseMsg = serverConnection.getFunctionResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
int numParts = 0;
if (functionResponseMsg.headerHasBeenSent()) {
if (e instanceof FunctionException
@@ -385,13 +385,13 @@ public class ExecuteRegionFunction66 extends BaseCommand {
numParts = 2;
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk while reply in progress: ", servConn.getName(),
+ logger.debug("{}: Sending exception chunk while reply in progress: ", serverConnection.getName(),
e);
}
- functionResponseMsg.setServerConnection(servConn);
+ functionResponseMsg.setServerConnection(serverConnection);
functionResponseMsg.setLastChunkAndNumParts(true, numParts);
// functionResponseMsg.setLastChunk(true);
- functionResponseMsg.sendChunk(servConn);
+ functionResponseMsg.sendChunk(serverConnection);
} else {
chunkedResponseMsg.setMessageType(messageType);
chunkedResponseMsg.setTransactionId(origMsg.getTransactionId());
@@ -412,11 +412,11 @@ public class ExecuteRegionFunction66 extends BaseCommand {
numParts = 2;
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk: ", servConn.getName(), e);
+ logger.debug("{}: Sending exception chunk: ", serverConnection.getName(), e);
}
- chunkedResponseMsg.setServerConnection(servConn);
+ chunkedResponseMsg.setServerConnection(serverConnection);
chunkedResponseMsg.setLastChunkAndNumParts(true, numParts);
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/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 917c120..075dee7 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
@@ -78,13 +78,13 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
int removedNodesSize = 0;
Set<Object> removedNodesSet = null;
int filterSize = 0, bucketIdsSize = 0, partNumber = 0;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT;
try {
byte[] bytes = clientMessage.getPart(0).getSerializedForm();
functionState = bytes[0];
if (bytes.length >= 5
- && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
+ && serverConnection.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
functionTimeout = Part.decodeInt(bytes, 1);
}
if (functionState != 1) {
@@ -93,8 +93,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
hasResult = functionState;
}
if (hasResult == 1) {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
regionName = clientMessage.getPart(1).getString();
function = clientMessage.getPart(2).getStringOrObject();
@@ -147,8 +147,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(clientMessage, exception, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, exception, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -164,8 +164,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString("region");
}
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
@@ -174,11 +174,11 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
String message =
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
- HandShake handShake = (HandShake) servConn.getHandshake();
+ HandShake handShake = (HandShake) serverConnection.getHandshake();
int earlierClientReadTimeout = handShake.getClientReadTimeout();
handShake.setClientReadTimeout(functionTimeout);
ServerToClientFunctionResultSender resultSender = null;
@@ -190,8 +190,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
String message =
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
} else {
byte functionStateOnServer = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -200,8 +200,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
String message =
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
}
@@ -209,10 +209,10 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
functionObject = (Function) function;
}
- this.securityService.authorizeDataWrite();
+ securityService.authorizeDataWrite();
// check if the caller is authorized to do this operation on server
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
final String functionName = functionObject.getId();
final String regionPath = region.getFullPath();
ExecuteFunctionOperationContext executeContext = null;
@@ -223,10 +223,10 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
- ChunkedMessage m = servConn.getFunctionResponseMessage();
+ ChunkedMessage m = serverConnection.getFunctionResponseMessage();
m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender65(m,
- MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
+ MessageType.EXECUTE_REGION_FUNCTION_RESULT, serverConnection, functionObject, executeContext);
if (isExecuteOnAllBuckets == 1) {
PartitionedRegion pr = (PartitionedRegion) region;
@@ -251,7 +251,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug("Executing Function: {} on Server: {} with Execution: {}",
- functionObject.getId(), servConn, execution);
+ functionObject.getId(), serverConnection, execution);
}
if (hasResult == 1) {
if (function instanceof String) {
@@ -292,7 +292,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, clientMessage, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, serverConnection, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
@@ -310,45 +310,45 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, clientMessage, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, serverConnection, 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, clientMessage, message, servConn, e);
+ sendException(hasResult, clientMessage, message, serverConnection, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
ServerConnection.executeFunctionOnLocalNodeOnly((byte) 0);
}
}
- private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
+ private void sendException(byte hasResult, Message msg, String message, ServerConnection serverConnection,
Throwable e) throws IOException {
synchronized (msg) {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
- servConn.setAsTrue(RESPONDED);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, message, serverConnection, e);
+ serverConnection.setAsTrue(RESPONDED);
}
}
}
- private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn)
+ private void sendError(byte hasResult, Message msg, String message, ServerConnection serverConnection)
throws IOException {
synchronized (msg) {
if (hasResult == 1) {
writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message,
- servConn);
- servConn.setAsTrue(RESPONDED);
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
}
protected static void writeFunctionResponseException(Message origMsg, int messageType,
- String message, ServerConnection servConn, Throwable e) throws IOException {
- ChunkedMessage functionResponseMsg = servConn.getFunctionResponseMessage();
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ String message, ServerConnection serverConnection, Throwable e) throws IOException {
+ ChunkedMessage functionResponseMsg = serverConnection.getFunctionResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
int numParts = 0;
if (functionResponseMsg.headerHasBeenSent()) {
if (e instanceof FunctionException
@@ -367,12 +367,12 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
numParts = 2;
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk while reply in progress: ", servConn.getName(),
+ logger.debug("{}: Sending exception chunk while reply in progress: ", serverConnection.getName(),
e);
}
- functionResponseMsg.setServerConnection(servConn);
+ functionResponseMsg.setServerConnection(serverConnection);
functionResponseMsg.setLastChunkAndNumParts(true, numParts);
- functionResponseMsg.sendChunk(servConn);
+ functionResponseMsg.sendChunk(serverConnection);
} else {
chunkedResponseMsg.setMessageType(messageType);
chunkedResponseMsg.setTransactionId(origMsg.getTransactionId());
@@ -393,11 +393,11 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
numParts = 2;
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk: ", servConn.getName(), e);
+ logger.debug("{}: Sending exception chunk: ", serverConnection.getName(), e);
}
- chunkedResponseMsg.setServerConnection(servConn);
+ chunkedResponseMsg.setServerConnection(serverConnection);
chunkedResponseMsg.setLastChunkAndNumParts(true, numParts);
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
index 8cc0582..83bfbef 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
@@ -132,7 +132,7 @@ public class Get70 extends BaseCommand {
GetOperationContext getContext = null;
try {
// for integrated security
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ securityService.authorizeRegionRead(regionName, key.toString());
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
@@ -189,7 +189,7 @@ public class Get70 extends BaseCommand {
}
// post process
- data = this.securityService.postProcess(regionName, key, data, entry.isObject);
+ data = securityService.postProcess(regionName, key, data, entry.isObject);
long oldStart = start;
start = DistributionStats.getStatTime();
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
index 8ec3402..6c8f184 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
@@ -68,7 +68,7 @@ public class GetAll extends BaseCommand {
}
if (logger.isDebugEnabled()) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(serverConnection.getName()).append(": Received getAll request (")
.append(clientMessage.getPayloadLength()).append(" bytes) from ")
.append(serverConnection.getSocketString()).append(" for region ").append(regionName)
@@ -116,7 +116,7 @@ public class GetAll extends BaseCommand {
// Send chunk response
try {
- fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection);
+ fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, securityService);
serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
@@ -130,7 +130,7 @@ public class GetAll extends BaseCommand {
}
private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys,
- ServerConnection servConn) throws IOException {
+ ServerConnection servConn, SecurityService securityService) throws IOException {
// Interpret null keys object as a request to get all key,value entry pairs
// of the region; otherwise iterate each key and perform the get behavior.
@@ -185,7 +185,7 @@ public class GetAll extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ securityService.authorizeRegionRead(regionName, key.toString());
} catch (NotAuthorizedException ex) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.GetAll_0_CAUGHT_THE_FOLLOWING_EXCEPTION_ATTEMPTING_TO_GET_VALUE_FOR_KEY_1,
@@ -229,7 +229,7 @@ public class GetAll extends BaseCommand {
}
// post process
- value = this.securityService.postProcess(regionName, key, value, isObject);
+ value = securityService.postProcess(regionName, key, value, isObject);
if (logger.isDebugEnabled()) {
logger.debug("{}: Returning value for key={}: {}", servConn.getName(), key, value);
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
index 8c0b0e9..8e5ab33 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
@@ -68,7 +68,7 @@ public class GetAll651 extends BaseCommand {
}
if (logger.isDebugEnabled()) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(serverConnection.getName()).append(": Received getAll request (")
.append(clientMessage.getPayloadLength()).append(" bytes) from ")
.append(serverConnection.getSocketString()).append(" for region ").append(regionName)
@@ -114,7 +114,7 @@ public class GetAll651 extends BaseCommand {
// Send chunk response
try {
- fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection);
+ fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, securityService);
serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
@@ -128,7 +128,7 @@ public class GetAll651 extends BaseCommand {
}
private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys,
- ServerConnection servConn) throws IOException {
+ ServerConnection servConn, SecurityService securityService) throws IOException {
// Interpret null keys object as a request to get all key,value entry pairs
// of the region; otherwise iterate each key and perform the get behavior.
@@ -184,7 +184,7 @@ public class GetAll651 extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ securityService.authorizeRegionRead(regionName, key.toString());
} catch (NotAuthorizedException ex) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.GetAll_0_CAUGHT_THE_FOLLOWING_EXCEPTION_ATTEMPTING_TO_GET_VALUE_FOR_KEY_1,
@@ -200,7 +200,7 @@ public class GetAll651 extends BaseCommand {
request.getValueAndIsObject(region, key, null, servConn, valueAndIsObject);
Object value = valueAndIsObject[0];
boolean isObject = ((Boolean) valueAndIsObject[1]).booleanValue();
- keyNotPresent = ((Boolean) valueAndIsObject[2]).booleanValue();;
+ keyNotPresent = ((Boolean) valueAndIsObject[2]).booleanValue();
if (isDebugEnabled) {
logger.debug("{}: Retrieved value for key={}: {}", servConn.getName(), key, value);
}
@@ -227,7 +227,7 @@ public class GetAll651 extends BaseCommand {
continue;
}
}
- value = this.securityService.postProcess(regionName, key, value, isObject);
+ value = securityService.postProcess(regionName, key, value, isObject);
if (isDebugEnabled) {
logger.debug("{}: Returning value for key={}: {}", servConn.getName(), key, value);
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
index 45ab383..8c91a57 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
@@ -77,7 +77,7 @@ public class GetAll70 extends BaseCommand {
requestSerializedValues = clientMessage.getPart(partIdx++).getInt() == 1;
if (logger.isDebugEnabled()) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(serverConnection.getName()).append(": Received getAll request (")
.append(clientMessage.getPayloadLength()).append(" bytes) from ")
.append(serverConnection.getSocketString()).append(" for region ").append(regionName)
@@ -124,7 +124,7 @@ public class GetAll70 extends BaseCommand {
// Send chunk response
try {
fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection,
- requestSerializedValues);
+ requestSerializedValues, securityService);
serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
@@ -138,7 +138,7 @@ public class GetAll70 extends BaseCommand {
}
private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys,
- ServerConnection servConn, boolean requestSerializedValues) throws IOException {
+ ServerConnection servConn, boolean requestSerializedValues, SecurityService securityService) throws IOException {
// Interpret null keys object as a request to get all key,value entry pairs
// of the region; otherwise iterate each key and perform the get behavior.
@@ -209,7 +209,7 @@ public class GetAll70 extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ securityService.authorizeRegionRead(regionName, key.toString());
} catch (NotAuthorizedException ex) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.GetAll_0_CAUGHT_THE_FOLLOWING_EXCEPTION_ATTEMPTING_TO_GET_VALUE_FOR_KEY_1,
@@ -259,7 +259,7 @@ public class GetAll70 extends BaseCommand {
}
}
- data = this.securityService.postProcess(regionName, key, data, entry.isObject);
+ data = securityService.postProcess(regionName, key, data, entry.isObject);
// Add the entry to the list that will be returned to the client
if (keyNotPresent) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
index 70e31e5..deae9fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
@@ -44,8 +44,6 @@ import org.apache.geode.security.NotAuthorizedException;
/**
* Initial version copied from GetAll70.java r48777.
- *
- *
*/
public class GetAllWithCallback extends BaseCommand {
private static final Logger logger = LogService.getLogger();
@@ -90,7 +88,7 @@ public class GetAllWithCallback extends BaseCommand {
}
if (logger.isDebugEnabled()) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(serverConnection.getName()).append(": Received getAll request (")
.append(clientMessage.getPayloadLength()).append(" bytes) from ")
.append(serverConnection.getSocketString()).append(" for region ").append(regionName)
@@ -135,7 +133,7 @@ public class GetAllWithCallback extends BaseCommand {
// Send chunk response
try {
- fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, callback);
+ fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, callback, securityService);
serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
@@ -146,12 +144,10 @@ public class GetAllWithCallback extends BaseCommand {
serverConnection.setAsTrue(RESPONDED);
return;
}
-
-
}
private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys,
- ServerConnection servConn, Object callback) throws IOException {
+ ServerConnection servConn, Object callback, SecurityService securityService) throws IOException {
assert keys != null;
int numKeys = keys.length;
@@ -193,7 +189,7 @@ public class GetAllWithCallback extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ securityService.authorizeRegionRead(regionName, key.toString());
} catch (NotAuthorizedException ex) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.GetAll_0_CAUGHT_THE_FOLLOWING_EXCEPTION_ATTEMPTING_TO_GET_VALUE_FOR_KEY_1,
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
index dad758c..0c1a0e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
@@ -55,7 +55,7 @@ public class Invalidate extends BaseCommand {
String regionName = null;
Object callbackArg = null, key = null;
Part eventPart = null;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
CacheServerStats stats = serverConnection.getCacheServerStats();
serverConnection.setAsTrue(REQUIRES_RESPONSE);
@@ -135,7 +135,7 @@ public class Invalidate extends BaseCommand {
try {
// for integrated security
- this.securityService.authorizeRegionWrite(regionName, key.toString());
+ securityService.authorizeRegionWrite(regionName, key.toString());
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
index 1fc3031..2f582b3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
@@ -94,7 +94,7 @@ public class KeySet extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName);
+ securityService.authorizeRegionRead(regionName);
} catch (NotAuthorizedException ex) {
writeChunkedException(clientMessage, ex, serverConnection);
serverConnection.setAsTrue(RESPONDED);
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
index 36beb96..ea7a679 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
@@ -48,7 +48,6 @@ public class Put extends BaseCommand {
return singleton;
}
-
@Override
public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
@@ -115,7 +114,7 @@ public class Put extends BaseCommand {
errMessage = LocalizedStrings.Put_THE_INPUT_REGION_NAME_FOR_THE_PUT_REQUEST_IS_NULL
.toLocalizedString();
}
- writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage,
serverConnection);
serverConnection.setAsTrue(RESPONDED);
return;
@@ -152,7 +151,7 @@ public class Put extends BaseCommand {
byte[] value = valuePart.getSerializedForm();
boolean isObject = valuePart.isObject();
- this.securityService.authorizeRegionWrite(regionName, key.toString());
+ securityService.authorizeRegionWrite(regionName, key.toString());
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
index 3556db2..12f133e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
@@ -12,9 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
@@ -63,7 +60,7 @@ public class Put61 extends BaseCommand {
String regionName = null;
Object callbackArg = null, key = null;
Part eventPart = null;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
boolean isDelta = false;
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
CacheServerStats stats = serverConnection.getCacheServerStats();
@@ -175,7 +172,7 @@ public class Put61 extends BaseCommand {
boolean isMetaRegion = region.isUsedForMetaRegion();
clientMessage.setMetaRegion(isMetaRegion);
- this.securityService.authorizeRegionWrite(regionName, key.toString());
+ securityService.authorizeRegionWrite(regionName, key.toString());
AuthorizeRequest authzRequest = null;
if (!isMetaRegion) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
index 50f9db0..2a9bd93 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
@@ -71,7 +71,7 @@ public class Put65 extends BaseCommand {
String regionName = null;
Object callbackArg = null, key = null;
Part eventPart = null;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
boolean isDelta = false;
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
CacheServerStats stats = serverConnection.getCacheServerStats();
@@ -232,7 +232,7 @@ public class Put65 extends BaseCommand {
boolean isMetaRegion = region.isUsedForMetaRegion();
clientMessage.setMetaRegion(isMetaRegion);
- this.securityService.authorizeRegionWrite(regionName, key.toString());
+ securityService.authorizeRegionWrite(regionName, key.toString());
AuthorizeRequest authzRequest = null;
if (!isMetaRegion) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
index 10eeb3e..0617497 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
@@ -12,9 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- * Author: Gester Zhou
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
@@ -67,7 +64,7 @@ public class PutAll extends BaseCommand {
int numberOfKeys = 0;
Object key = null;
Part eventPart = null;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
CacheServerStats stats = serverConnection.getCacheServerStats();
boolean replyWithMetaData = false;
@@ -167,7 +164,7 @@ public class PutAll extends BaseCommand {
serverConnection.setRequestSpecificTimeout(timeout);
}
- this.securityService.authorizeRegionWrite(regionName);
+ securityService.authorizeRegionWrite(regionName);
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
index 1e0c194..7bd95b5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
@@ -12,9 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- * Author: Gester Zhou
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
@@ -55,7 +52,6 @@ public class PutAll70 extends BaseCommand {
private final static PutAll70 singleton = new PutAll70();
-
public static Command getCommand() {
return singleton;
}
@@ -74,7 +70,7 @@ public class PutAll70 extends BaseCommand {
boolean replyWithMetaData = false;
VersionedObjectList response = null;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
CacheServerStats stats = serverConnection.getCacheServerStats();
@@ -210,7 +206,7 @@ public class PutAll70 extends BaseCommand {
serverConnection.setRequestSpecificTimeout(timeout);
}
- this.securityService.authorizeRegionWrite(regionName);
+ securityService.authorizeRegionWrite(regionName);
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
index acf8017..330b91d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
@@ -12,9 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- * Author: Gester Zhou
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
@@ -87,7 +84,7 @@ public class PutAll80 extends BaseCommand {
boolean replyWithMetaData = false;
VersionedObjectList response = null;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
CacheServerStats stats = serverConnection.getCacheServerStats();
@@ -246,7 +243,7 @@ public class PutAll80 extends BaseCommand {
serverConnection.setRequestSpecificTimeout(timeout);
}
- this.securityService.authorizeRegionWrite(regionName);
+ securityService.authorizeRegionWrite(regionName);
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
index 927da30..f0138eb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
@@ -90,7 +90,7 @@ public class Query extends BaseCommandQuery {
}
processQuery(clientMessage, query, queryString, regionNames, start, null, queryContext,
- serverConnection, true);
+ serverConnection, true, securityService);
} catch (QueryInvalidException e) {
throw new QueryInvalidException(e.getMessage() + queryString);
} catch (QueryExecutionLowMemoryException e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
index 47083cf..81959c5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
@@ -131,7 +131,7 @@ public class Query651 extends BaseCommandQuery {
}
processQueryUsingParams(clientMessage, query, queryString, regionNames, start, null,
- queryContext, serverConnection, true, queryParams);
+ queryContext, serverConnection, true, queryParams, securityService);
} catch (QueryInvalidException e) {
throw new QueryInvalidException(e.getMessage() + queryString);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
index 21e88b0..595142c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
@@ -148,9 +148,9 @@ public class RegisterInterest extends BaseCommand {
// Register interest
try {
if (interestType == InterestType.REGULAR_EXPRESSION) {
- this.securityService.authorizeRegionRead(regionName);
+ securityService.authorizeRegionRead(regionName);
} else {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ securityService.authorizeRegionRead(regionName, key.toString());
}
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
index 371788f..9db351d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
@@ -12,9 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
@@ -187,9 +184,9 @@ public class RegisterInterest61 extends BaseCommand {
try {
if (interestType == InterestType.REGULAR_EXPRESSION) {
- this.securityService.authorizeRegionRead(regionName);
+ securityService.authorizeRegionRead(regionName);
} else {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ securityService.authorizeRegionRead(regionName, key.toString());
}
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
index 117e284..88da7cd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
@@ -12,33 +12,31 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
+import org.apache.geode.cache.DynamicRegionFactory;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.operations.RegisterInterestOperationContext;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
+import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.Part;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
-import org.apache.geode.cache.DynamicRegionFactory;
-import org.apache.geode.cache.InterestResultPolicy;
-import org.apache.geode.cache.operations.RegisterInterestOperationContext;
-import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-/**
- *
- */
public class RegisterInterestList extends BaseCommand {
private final static RegisterInterestList singleton = new RegisterInterestList();
@@ -173,7 +171,7 @@ public class RegisterInterestList extends BaseCommand {
// responded = true;
} // else { // region not null
try {
- this.securityService.authorizeRegionRead(regionName);
+ securityService.authorizeRegionRead(regionName);
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
index 05de03c..4e81536 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
@@ -12,24 +12,25 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
+import org.apache.geode.cache.DynamicRegionFactory;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.operations.RegisterInterestOperationContext;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
+import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.Part;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
-import org.apache.geode.cache.DynamicRegionFactory;
-import org.apache.geode.cache.InterestResultPolicy;
-import org.apache.geode.cache.operations.RegisterInterestOperationContext;
-import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
@@ -172,7 +173,6 @@ public class RegisterInterestList61 extends BaseCommand {
return;
}
-
LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
logger.info(LocalizedMessage.create(
@@ -183,7 +183,7 @@ public class RegisterInterestList61 extends BaseCommand {
// responded = true;
} // else { // region not null
try {
- this.securityService.authorizeRegionRead(regionName);
+ securityService.authorizeRegionRead(regionName);
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
index 734fdbc..55cc4bf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
@@ -12,37 +12,36 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
+import org.apache.geode.cache.DynamicRegionFactory;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.operations.RegisterInterestOperationContext;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
+import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.Part;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
-import org.apache.geode.cache.DynamicRegionFactory;
-import org.apache.geode.cache.InterestResultPolicy;
-import org.apache.geode.cache.operations.RegisterInterestOperationContext;
-import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
import java.util.List;
/**
- *
* All keys of the register interest list are being sent as a single part since 6.6. There is no
* need to send no keys as a separate part.In earlier versions {@link RegisterInterestList61} number
* of keys & each individual key was sent as a separate part.
- *
- *
+ *
* @since GemFire 6.6
*/
public class RegisterInterestList66 extends BaseCommand {
@@ -58,7 +57,7 @@ public class RegisterInterestList66 extends BaseCommand {
@Override
public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
- Part regionNamePart = null, keyPart = null;// numberOfKeysPart = null;
+ Part regionNamePart = null, keyPart = null;
String regionName = null;
Object key = null;
InterestResultPolicy policy;
@@ -69,10 +68,6 @@ public class RegisterInterestList66 extends BaseCommand {
serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
ChunkedMessage chunkedResponseMsg = serverConnection.getRegisterInterestResponseMessage();
- // bserverStats.incLong(readDestroyRequestTimeId,
- // DistributionStats.getStatTime() - start);
- // bserverStats.incInt(destroyRequestsId, 1);
- // start = DistributionStats.getStatTime();
// Retrieve the data from the message parts
regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
@@ -140,18 +135,6 @@ public class RegisterInterestList66 extends BaseCommand {
serverConnection.getSocketString(), numberOfKeys, regionName, keys);
}
- /*
- * AcceptorImpl acceptor = servConn.getAcceptor();
- *
- * // Check if the Server is running in NotifyBySubscription=true mode. if
- * (!acceptor.getCacheClientNotifier().getNotifyBySubscription()) { // This should have been
- * taken care at the client. String err = LocalizedStrings.
- * RegisterInterest_INTEREST_REGISTRATION_IS_SUPPORTED_ONLY_FOR_SERVERS_WITH_NOTIFYBYSUBSCRIPTION_SET_TO_TRUE
- * .toLocalizedString(); writeChunkedErrorResponse(msg,
- * MessageType.REGISTER_INTEREST_DATA_ERROR, err, servConn); servConn.setAsTrue(RESPONDED);
- * return; }
- */
-
// Process the register interest request
if (keys.isEmpty() || regionName == null) {
StringId errMessage = null;
@@ -178,12 +161,9 @@ public class RegisterInterestList66 extends BaseCommand {
logger.info(LocalizedMessage.create(
LocalizedStrings.RegisterInterestList_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_LIST_REQUEST,
new Object[] {serverConnection.getName(), regionName}));
- // writeChunkedErrorResponse(msg,
- // MessageType.REGISTER_INTEREST_DATA_ERROR, message);
- // responded = true;
- } // else { // region not null
+ }
try {
- this.securityService.authorizeRegionRead(regionName);
+ securityService.authorizeRegionRead(regionName);
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
@@ -205,11 +185,6 @@ public class RegisterInterestList66 extends BaseCommand {
return;
}
- // Update the statistics and write the reply
- // bserverStats.incLong(processDestroyTimeId,
- // DistributionStats.getStatTime() - start);
- // start = DistributionStats.getStatTime();
-
boolean isPrimary = serverConnection.getAcceptor().getCacheClientNotifier()
.getClientProxy(serverConnection.getProxyID()).isPrimary();
if (!isPrimary) {
@@ -245,18 +220,11 @@ public class RegisterInterestList66 extends BaseCommand {
}
if (logger.isDebugEnabled()) {
- // logger.debug(getName() + ": Sent chunk (1 of 1) of register interest
- // response (" + chunkedResponseMsg.getBufferLength() + " bytes) for
- // region " + regionName + " key " + key);
logger.debug(
"{}: Sent register interest response for the following {} keys in region {}: {}",
serverConnection.getName(), numberOfKeys, regionName, keys);
}
- // bserverStats.incLong(writeDestroyResponseTimeId,
- // DistributionStats.getStatTime() - start);
- // bserverStats.incInt(destroyResponsesId, 1);
} // isPrimary
- // } // region not null
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
index 2d3cd5c..8425bdc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
@@ -12,11 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- * Author: dschneider
- *
- * @since GemFire 8.1
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
@@ -73,7 +68,7 @@ public class RemoveAll extends BaseCommand {
boolean replyWithMetaData = false;
VersionedObjectList response = null;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
CacheServerStats stats = serverConnection.getCacheServerStats();
@@ -191,7 +186,7 @@ public class RemoveAll extends BaseCommand {
serverConnection.setRequestSpecificTimeout(timeout);
}
- this.securityService.authorizeRegionWrite(regionName);
+ securityService.authorizeRegionWrite(regionName);
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
index 74a1562..2926844 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
@@ -12,9 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
@@ -127,7 +124,7 @@ public class Request extends BaseCommand {
GetOperationContext getContext = null;
try {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ securityService.authorizeRegionRead(regionName, key.toString());
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
getContext = authzRequest.getAuthorize(regionName, key, callbackArg);
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
index 41f95bd..3bc4b01 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
@@ -12,9 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
@@ -35,7 +32,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.GemFireSecurityException;
-
public class Size extends BaseCommand {
private final static Size singleton = new Size();
@@ -94,7 +90,7 @@ public class Size extends BaseCommand {
// Size the entry
try {
- this.securityService.authorizeRegionRead(regionName);
+ securityService.authorizeRegionRead(regionName);
writeSizeResponse(region.size(), clientMessage, serverConnection);
} catch (RegionDestroyedException rde) {
writeException(clientMessage, rde, false, serverConnection);
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
index cf00f5e..5435dba 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
@@ -12,9 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
@@ -34,7 +31,6 @@ import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
-
public class UnregisterInterest extends BaseCommand {
private final static UnregisterInterest singleton = new UnregisterInterest();
@@ -106,9 +102,9 @@ public class UnregisterInterest extends BaseCommand {
try {
if (interestType == InterestType.REGULAR_EXPRESSION) {
- this.securityService.authorizeRegionRead(regionName);
+ securityService.authorizeRegionRead(regionName);
} else {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ securityService.authorizeRegionRead(regionName, key.toString());
}
} catch (NotAuthorizedException ex) {
writeException(clientMessage, ex, false, serverConnection);
http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
index 80d5abc..48c2ee3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
@@ -122,7 +122,7 @@ public class UnregisterInterestList extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName);
+ securityService.authorizeRegionRead(regionName);
} catch (NotAuthorizedException ex) {
writeException(clientMessage, ex, false, serverConnection);
serverConnection.setAsTrue(RESPONDED);