http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java index 704f2da..d489b88 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java @@ -188,7 +188,7 @@ public class GatewayReceiverCommand extends BaseCommand { int dsid = clientMessage.getPart(partNumber++).getInt(); boolean removeOnException = - clientMessage.getPart(partNumber++).getSerializedForm()[0] == 1 ? true : false; + clientMessage.getPart(partNumber++).getSerializedForm()[0] == 1 ? true : false; // Keep track of whether a response has been written for // exceptions @@ -218,8 +218,7 @@ public class GatewayReceiverCommand extends BaseCommand { } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_REQUEST_1_CONTAINING_2_EVENTS, - new Object[] { - serverConnection.getName(), Integer.valueOf(batchId), + new Object[] {serverConnection.getName(), Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)}), e); throw e; @@ -252,8 +251,7 @@ public class GatewayReceiverCommand extends BaseCommand { } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_REQUEST_1_CONTAINING_2_EVENTS, - new Object[] { - serverConnection.getName(), Integer.valueOf(batchId), + new Object[] {serverConnection.getName(), Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)}), e); throw e; @@ -266,8 +264,7 @@ public class GatewayReceiverCommand extends BaseCommand { } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_REQUEST_1_CONTAINING_2_EVENTS, - new Object[] { - serverConnection.getName(), Integer.valueOf(batchId), + new Object[] {serverConnection.getName(), Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)}), e); throw e; @@ -303,8 +300,7 @@ public class GatewayReceiverCommand extends BaseCommand { } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_CREATE_REQUEST_1_FOR_2_EVENTS, - new Object[] { - serverConnection.getName(), Integer.valueOf(batchId), + new Object[] {serverConnection.getName(), Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)}), e); throw e; @@ -313,14 +309,15 @@ public class GatewayReceiverCommand extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Processing batch create request {} on {} for region {} key {} value {} callbackArg {}, eventId={}", - serverConnection.getName(), batchId, serverConnection.getSocketString(), regionName, key, - valuePart, callbackArg, eventId); + serverConnection.getName(), batchId, serverConnection.getSocketString(), + regionName, key, valuePart, callbackArg, eventId); } versionTimeStamp = clientMessage.getPart(index++).getLong(); // Process the create request if (key == null || regionName == null) { StringId message = null; - Object[] messageArgs = new Object[] { serverConnection.getName(), Integer.valueOf(batchId)}; + Object[] messageArgs = + new Object[] {serverConnection.getName(), Integer.valueOf(batchId)}; if (key == null) { message = LocalizedStrings.ProcessBatch_0_THE_INPUT_REGION_NAME_FOR_THE_BATCH_CREATE_REQUEST_1_IS_NULL; @@ -381,15 +378,13 @@ public class GatewayReceiverCommand extends BaseCommand { // This exception will be logged in the catch block below throw new Exception( LocalizedStrings.ProcessBatch_0_FAILED_TO_CREATE_OR_UPDATE_ENTRY_FOR_REGION_1_KEY_2_VALUE_3_CALLBACKARG_4 - .toLocalizedString(new Object[] { - serverConnection.getName(), regionName, key, - valuePart, callbackArg})); + .toLocalizedString(new Object[] {serverConnection.getName(), regionName, + key, valuePart, callbackArg})); } } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_CREATE_REQUEST_1_FOR_2_EVENTS, - new Object[] { - serverConnection.getName(), Integer.valueOf(batchId), + new Object[] {serverConnection.getName(), Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)}), e); throw e; @@ -425,8 +420,7 @@ public class GatewayReceiverCommand extends BaseCommand { } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_UPDATE_REQUEST_1_CONTAINING_2_EVENTS, - new Object[] { - serverConnection.getName(), Integer.valueOf(batchId), + new Object[] {serverConnection.getName(), Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)}), e); throw e; @@ -436,13 +430,14 @@ public class GatewayReceiverCommand extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Processing batch update request {} on {} for region {} key {} value {} callbackArg {}", - serverConnection.getName(), batchId, serverConnection.getSocketString(), regionName, key, - valuePart, callbackArg); + serverConnection.getName(), batchId, serverConnection.getSocketString(), + regionName, key, valuePart, callbackArg); } // Process the update request if (key == null || regionName == null) { StringId message = null; - Object[] messageArgs = new Object[] { serverConnection.getName(), Integer.valueOf(batchId)}; + Object[] messageArgs = + new Object[] {serverConnection.getName(), Integer.valueOf(batchId)}; if (key == null) { message = LocalizedStrings.ProcessBatch_0_THE_INPUT_KEY_FOR_THE_BATCH_UPDATE_REQUEST_1_IS_NULL; @@ -490,8 +485,8 @@ public class GatewayReceiverCommand extends BaseCommand { serverConnection.setModificationInfo(true, regionName, key); stats.incUpdateRequest(); } else { - final Object[] msgArgs = - new Object[] { serverConnection.getName(), regionName, key, valuePart, callbackArg}; + final Object[] msgArgs = new Object[] {serverConnection.getName(), regionName, + key, valuePart, callbackArg}; final StringId message = LocalizedStrings.ProcessBatch_0_FAILED_TO_UPDATE_ENTRY_FOR_REGION_1_KEY_2_VALUE_3_AND_CALLBACKARG_4; String s = message.toLocalizedString(msgArgs); @@ -501,11 +496,12 @@ public class GatewayReceiverCommand extends BaseCommand { } catch (CancelException e) { // FIXME better exception hierarchy would avoid this check if (serverConnection.getCachedRegionHelper().getCache().getCancelCriterion() - .isCancelInProgress()) { + .isCancelInProgress()) { if (logger.isDebugEnabled()) { logger.debug( "{} ignoring message of type {} from client {} because shutdown occurred during message processing.", - serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()), + serverConnection.getName(), + MessageType.getString(clientMessage.getMessageType()), serverConnection.getProxyID()); } serverConnection.setFlagProcessMessagesAsFalse(); @@ -518,8 +514,7 @@ public class GatewayReceiverCommand extends BaseCommand { // Preserve the connection under all circumstances logger.warn(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_UPDATE_REQUEST_1_CONTAINING_2_EVENTS, - new Object[] { - serverConnection.getName(), Integer.valueOf(batchId), + new Object[] {serverConnection.getName(), Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)}), e); throw e; @@ -540,8 +535,7 @@ public class GatewayReceiverCommand extends BaseCommand { } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_DESTROY_REQUEST_1_CONTAINING_2_EVENTS, - new Object[] { - serverConnection.getName(), Integer.valueOf(batchId), + new Object[] {serverConnection.getName(), Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)}), e); throw e; @@ -551,7 +545,8 @@ public class GatewayReceiverCommand extends BaseCommand { versionTimeStamp = clientMessage.getPart(index++).getLong(); if (logger.isDebugEnabled()) { logger.debug("{}: Processing batch destroy request {} on {} for region {} key {}", - serverConnection.getName(), batchId, serverConnection.getSocketString(), regionName, key); + serverConnection.getName(), batchId, serverConnection.getSocketString(), + regionName, key); } // Process the destroy request @@ -565,7 +560,8 @@ public class GatewayReceiverCommand extends BaseCommand { message = LocalizedStrings.ProcessBatch_0_THE_INPUT_REGION_NAME_FOR_THE_BATCH_DESTROY_REQUEST_1_IS_NULL; } - Object[] messageArgs = new Object[] { serverConnection.getName(), Integer.valueOf(batchId)}; + Object[] messageArgs = + new Object[] {serverConnection.getName(), Integer.valueOf(batchId)}; String s = message.toLocalizedString(messageArgs); logger.warn(s); throw new Exception(s); @@ -598,7 +594,7 @@ public class GatewayReceiverCommand extends BaseCommand { } catch (EntryNotFoundException e) { logger.info(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_DURING_BATCH_DESTROY_NO_ENTRY_WAS_FOUND_FOR_KEY_1, - new Object[] { serverConnection.getName(), key})); + new Object[] {serverConnection.getName(), key})); // throw new Exception(e); } } @@ -633,8 +629,7 @@ public class GatewayReceiverCommand extends BaseCommand { } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_UPDATE_VERSION_REQUEST_1_CONTAINING_2_EVENTS, - new Object[] { - serverConnection.getName(), Integer.valueOf(batchId), + new Object[] {serverConnection.getName(), Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)}), e); throw e; @@ -644,17 +639,16 @@ public class GatewayReceiverCommand extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Processing batch update-version request {} on {} for region {} key {} value {} callbackArg {}", - serverConnection.getName(), batchId, serverConnection.getSocketString(), regionName, key, - valuePart, callbackArg); + serverConnection.getName(), batchId, serverConnection.getSocketString(), + regionName, key, valuePart, callbackArg); } // Process the update time-stamp request if (key == null || regionName == null) { StringId message = LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_UPDATE_VERSION_REQUEST_1_CONTAINING_2_EVENTS; - Object[] messageArgs = new Object[] { - serverConnection.getName(), Integer.valueOf(batchId), - Integer.valueOf(numberOfEvents)}; + Object[] messageArgs = new Object[] {serverConnection.getName(), + Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)}; String s = message.toLocalizedString(messageArgs); logger.warn(s); throw new Exception(s); @@ -679,13 +673,13 @@ public class GatewayReceiverCommand extends BaseCommand { // Update the version tag try { - region.basicBridgeUpdateVersionStamp(key, callbackArg, serverConnection.getProxyID(), - false, clientEvent); + region.basicBridgeUpdateVersionStamp(key, callbackArg, + serverConnection.getProxyID(), false, clientEvent); } catch (EntryNotFoundException e) { logger.info(LocalizedMessage.create( LocalizedStrings.ProcessBatch_0_DURING_BATCH_UPDATE_VERSION_NO_ENTRY_WAS_FOUND_FOR_KEY_1, - new Object[] { serverConnection.getName(), key})); + new Object[] {serverConnection.getName(), key})); // throw new Exception(e); } } @@ -695,8 +689,7 @@ public class GatewayReceiverCommand extends BaseCommand { default: logger.fatal(LocalizedMessage.create( LocalizedStrings.Processbatch_0_UNKNOWN_ACTION_TYPE_1_FOR_BATCH_FROM_2, - new Object[] { - serverConnection.getName(), Integer.valueOf(actionType), + new Object[] {serverConnection.getName(), Integer.valueOf(actionType), serverConnection.getSocketString()})); stats.incUnknowsOperationsReceived(); } @@ -718,7 +711,7 @@ public class GatewayReceiverCommand extends BaseCommand { if (e.getCause() instanceof PdxRegistryMismatchException) { fatalException = e.getCause(); logger.fatal(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_PDX_CONFIGURATION, - new Object[] { serverConnection.getMembershipID()}), e.getCause()); + new Object[] {serverConnection.getMembershipID()}), e.getCause()); break; }
http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 7017aa8..2ca8804 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 @@ -98,8 +98,8 @@ public class Get70 extends BaseCommand { } if (logger.isDebugEnabled()) { logger.debug("{}: Received 7.0 get request ({} bytes) from {} for region {} key {} txId {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName, key, - clientMessage.getTransactionId()); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName, key, clientMessage.getTransactionId()); } // Process the get request @@ -197,14 +197,16 @@ public class Get70 extends BaseCommand { if (region instanceof PartitionedRegion) { PartitionedRegion pr = (PartitionedRegion) region; if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) { - writeResponseWithRefreshMetadata(data, callbackArg, clientMessage, isObject, serverConnection, pr, - pr.getNetworkHopType(), versionTag, keyNotPresent); + writeResponseWithRefreshMetadata(data, callbackArg, clientMessage, isObject, + serverConnection, pr, pr.getNetworkHopType(), versionTag, keyNotPresent); pr.clearNetworkHopData(); } else { - writeResponse(data, callbackArg, clientMessage, isObject, versionTag, keyNotPresent, serverConnection); + writeResponse(data, callbackArg, clientMessage, isObject, versionTag, keyNotPresent, + serverConnection); } } else { - writeResponse(data, callbackArg, clientMessage, isObject, versionTag, keyNotPresent, serverConnection); + writeResponse(data, callbackArg, clientMessage, isObject, versionTag, keyNotPresent, + serverConnection); } } finally { OffHeapHelper.release(originalData); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 5f7cb29..01c5c9c 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 @@ -69,8 +69,9 @@ public class GetAll extends BaseCommand { if (logger.isDebugEnabled()) { StringBuffer buffer = new StringBuffer(); buffer.append(serverConnection.getName()).append(": Received getAll request (") - .append(clientMessage.getPayloadLength()).append(" bytes) from ").append(serverConnection.getSocketString()) - .append(" for region ").append(regionName).append(" keys "); + .append(clientMessage.getPayloadLength()).append(" bytes) from ") + .append(serverConnection.getSocketString()).append(" for region ").append(regionName) + .append(" keys "); if (keys != null) { for (int i = 0; i < keys.length; i++) { buffer.append(keys[i]).append(" "); @@ -92,7 +93,8 @@ public class GetAll extends BaseCommand { .toLocalizedString(); } logger.warn("{}: {}", serverConnection.getName(), message); - writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message, serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 b0a1915..ad8ef49 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 @@ -69,8 +69,9 @@ public class GetAll651 extends BaseCommand { if (logger.isDebugEnabled()) { StringBuffer buffer = new StringBuffer(); buffer.append(serverConnection.getName()).append(": Received getAll request (") - .append(clientMessage.getPayloadLength()).append(" bytes) from ").append(serverConnection.getSocketString()) - .append(" for region ").append(regionName).append(" keys "); + .append(clientMessage.getPayloadLength()).append(" bytes) from ") + .append(serverConnection.getSocketString()).append(" for region ").append(regionName) + .append(" keys "); if (keys != null) { for (int i = 0; i < keys.length; i++) { buffer.append(keys[i]).append(" "); @@ -90,7 +91,8 @@ public class GetAll651 extends BaseCommand { .toLocalizedString(); } logger.warn("{}: {}", serverConnection.getName(), message); - writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message, serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 579593f..267a5b2 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 @@ -78,8 +78,9 @@ public class GetAll70 extends BaseCommand { if (logger.isDebugEnabled()) { StringBuffer buffer = new StringBuffer(); buffer.append(serverConnection.getName()).append(": Received getAll request (") - .append(clientMessage.getPayloadLength()).append(" bytes) from ").append(serverConnection.getSocketString()) - .append(" for region ").append(regionName).append(" keys "); + .append(clientMessage.getPayloadLength()).append(" bytes) from ") + .append(serverConnection.getSocketString()).append(" for region ").append(regionName) + .append(" keys "); if (keys != null) { for (int i = 0; i < keys.length; i++) { buffer.append(keys[i]).append(" "); @@ -99,7 +100,8 @@ public class GetAll70 extends BaseCommand { .toLocalizedString(); } logger.warn("{}: {}", serverConnection.getName(), message); - writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message, serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -120,7 +122,8 @@ public class GetAll70 extends BaseCommand { // Send chunk response try { - fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, requestSerializedValues); + fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, + requestSerializedValues); serverConnection.setAsTrue(RESPONDED); } catch (Exception e) { // If an interrupted exception is thrown , rethrow it http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 c6663de..db97d53 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 @@ -91,9 +91,9 @@ public class GetAllWithCallback extends BaseCommand { if (logger.isDebugEnabled()) { StringBuffer buffer = new StringBuffer(); buffer.append(serverConnection.getName()).append(": Received getAll request (") - .append(clientMessage.getPayloadLength()).append(" bytes) from ").append(serverConnection.getSocketString()) - .append(" for region ").append(regionName).append(" with callback ").append(callback) - .append(" keys "); + .append(clientMessage.getPayloadLength()).append(" bytes) from ") + .append(serverConnection.getSocketString()).append(" for region ").append(regionName) + .append(" with callback ").append(callback).append(" keys "); if (keys != null) { for (int i = 0; i < keys.length; i++) { buffer.append(keys[i]).append(" "); @@ -113,8 +113,9 @@ public class GetAllWithCallback extends BaseCommand { .toLocalizedString(); } logger.warn(LocalizedMessage.create(LocalizedStrings.TWO_ARG_COLON, - new Object[] { serverConnection.getName(), message})); - writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message, serverConnection); + new Object[] {serverConnection.getName(), message})); + writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java index bcdbd08..201b5c0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java @@ -60,7 +60,8 @@ public class GetClientPRMetadataCommand extends BaseCommand { .create(LocalizedStrings.GetClientPRMetadata_THE_INPUT_REGION_PATH_IS_NULL)); errMessage = LocalizedStrings.GetClientPRMetadata_THE_INPUT_REGION_PATH_IS_NULL.toLocalizedString(); - writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR, + errMessage.toString(), serverConnection); serverConnection.setAsTrue(RESPONDED); } else { Region region = crHelper.getRegion(regionFullPath); @@ -70,7 +71,8 @@ public class GetClientPRMetadataCommand extends BaseCommand { regionFullPath)); errMessage = LocalizedStrings.GetClientPRMetadata_REGION_NOT_FOUND.toLocalizedString() + regionFullPath; - writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR, + errMessage.toString(), serverConnection); serverConnection.setAsTrue(RESPONDED); } else { try { http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java index 4c519a9..7b370fe 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java @@ -58,7 +58,8 @@ public class GetClientPRMetadataCommand66 extends BaseCommand { .create(LocalizedStrings.GetClientPRMetadata_THE_INPUT_REGION_PATH_IS_NULL)); errMessage = LocalizedStrings.GetClientPRMetadata_THE_INPUT_REGION_PATH_IS_NULL.toLocalizedString(); - writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR, + errMessage.toString(), serverConnection); serverConnection.setAsTrue(RESPONDED); } else { Region region = crHelper.getRegion(regionFullPath); @@ -68,7 +69,8 @@ public class GetClientPRMetadataCommand66 extends BaseCommand { regionFullPath)); errMessage = LocalizedStrings.GetClientPRMetadata_REGION_NOT_FOUND.toLocalizedString() + regionFullPath; - writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR, + errMessage.toString(), serverConnection); serverConnection.setAsTrue(RESPONDED); } else { try { http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java index f56a4d9..2c1f26c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java @@ -34,7 +34,8 @@ public class GetFunctionAttribute extends BaseCommand { } @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { serverConnection.setAsTrue(REQUIRES_RESPONSE); String functionId = clientMessage.getPart(0).getString(); if (functionId == null) { http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java index cc7dd05..15215de 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java @@ -40,8 +40,9 @@ public class GetPDXEnumById extends BaseCommand { throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { - logger.debug("{}: Received get pdx enum by id request ({} parts) from {}", serverConnection.getName(), - clientMessage.getNumberOfParts(), serverConnection.getSocketString()); + logger.debug("{}: Received get pdx enum by id request ({} parts) from {}", + serverConnection.getName(), clientMessage.getNumberOfParts(), + serverConnection.getSocketString()); } int enumId = clientMessage.getPart(0).getInt(); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java index 7bf5b4f..40c62a7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java @@ -41,7 +41,8 @@ public class GetPDXIdForEnum extends BaseCommand { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { logger.debug("{}: Received get pdx id for enum request ({} parts) from {}", - serverConnection.getName(), clientMessage.getNumberOfParts(), serverConnection.getSocketString()); + serverConnection.getName(), clientMessage.getNumberOfParts(), + serverConnection.getSocketString()); } EnumInfo enumInfo = (EnumInfo) clientMessage.getPart(0).getObject(); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java index e5dc5f0..c1de0fc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java @@ -41,7 +41,8 @@ public class GetPDXIdForType extends BaseCommand { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { logger.debug("{}: Received get pdx id for type request ({} parts) from {}", - serverConnection.getName(), clientMessage.getNumberOfParts(), serverConnection.getSocketString()); + serverConnection.getName(), clientMessage.getNumberOfParts(), + serverConnection.getSocketString()); } int noOfParts = clientMessage.getNumberOfParts(); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java index 032e8b3..16e9dd0 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java @@ -40,8 +40,9 @@ public class GetPDXTypeById extends BaseCommand { throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { - logger.debug("{}: Received get pdx type by id request ({} parts) from {}", serverConnection.getName(), - clientMessage.getNumberOfParts(), serverConnection.getSocketString()); + logger.debug("{}: Received get pdx type by id request ({} parts) from {}", + serverConnection.getName(), clientMessage.getNumberOfParts(), + serverConnection.getSocketString()); } int pdxId = clientMessage.getPart(0).getInt(); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java index 314ba07..040e1c2 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java @@ -36,11 +36,12 @@ public class Invalid extends BaseCommand { private Invalid() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { logger.error( LocalizedMessage.create(LocalizedStrings.Invalid_0_INVALID_MESSAGE_TYPE_WITH_TX_1_FROM_2, - new Object[] { - serverConnection.getName(), Integer.valueOf(clientMessage.getTransactionId()), + new Object[] {serverConnection.getName(), + Integer.valueOf(clientMessage.getTransactionId()), serverConnection.getSocketString()})); writeErrorResponse(clientMessage, MessageType.INVALID, serverConnection); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 22bf6f4..801b3ad 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 @@ -87,9 +87,9 @@ public class Invalidate extends BaseCommand { return; } if (logger.isDebugEnabled()) { - logger.debug(serverConnection.getName() + ": Received invalidate request (" + clientMessage.getPayloadLength() - + " bytes) from " + serverConnection.getSocketString() + " for region " + regionName + " key " - + key); + logger.debug(serverConnection.getName() + ": Received invalidate request (" + + clientMessage.getPayloadLength() + " bytes) from " + serverConnection.getSocketString() + + " for region " + regionName + " key " + key); } // Process the invalidate request @@ -108,7 +108,8 @@ public class Invalidate extends BaseCommand { .append(LocalizedStrings.BaseCommand__THE_INPUT_REGION_NAME_FOR_THE_0_REQUEST_IS_NULL .toLocalizedString("invalidate")); } - writeErrorResponse(clientMessage, MessageType.DESTROY_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.DESTROY_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -124,7 +125,8 @@ public class Invalidate extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); Breadcrumbs.setEventId(eventId); @@ -157,7 +159,8 @@ public class Invalidate extends BaseCommand { } } - region.basicBridgeInvalidate(key, callbackArg, serverConnection.getProxyID(), true, clientEvent); + region.basicBridgeInvalidate(key, callbackArg, serverConnection.getProxyID(), true, + clientEvent); tag = clientEvent.getVersionTag(); serverConnection.setModificationInfo(true, regionName, key); } catch (EntryNotFoundException e) { @@ -199,7 +202,8 @@ public class Invalidate extends BaseCommand { if (region instanceof PartitionedRegion) { PartitionedRegion pr = (PartitionedRegion) region; if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) { - writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, pr.getNetworkHopType(), tag); + writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, pr.getNetworkHopType(), + tag); pr.clearNetworkHopData(); } else { writeReply(clientMessage, serverConnection, tag); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 a35c4b0..66de347 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 @@ -62,7 +62,8 @@ public class KeySet extends BaseCommand { final boolean isDebugEnabled = logger.isDebugEnabled(); if (isDebugEnabled) { logger.debug("{}: Received key set request ({} bytes) from {} for region {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName); } // Process the key set request @@ -76,7 +77,8 @@ public class KeySet extends BaseCommand { LocalizedStrings.KeySet_0_THE_INPUT_REGION_NAME_FOR_THE_KEY_SET_REQUEST_IS_NULL, serverConnection.getName())); } - writeKeySetErrorResponse(clientMessage, MessageType.KEY_SET_DATA_ERROR, message, serverConnection); + writeKeySetErrorResponse(clientMessage, MessageType.KEY_SET_DATA_ERROR, message, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -128,7 +130,8 @@ public class KeySet extends BaseCommand { checkForInterrupt(serverConnection, e); // Otherwise, write an exception message and continue - writeChunkedException(clientMessage, e, serverConnection, serverConnection.getChunkedResponseMessage()); + writeChunkedException(clientMessage, e, serverConnection, + serverConnection.getChunkedResponseMessage()); serverConnection.setAsTrue(RESPONDED); return; } @@ -137,7 +140,8 @@ public class KeySet extends BaseCommand { // logger.fine(getName() + ": Sent chunk (1 of 1) of register interest // response (" + chunkedResponseMsg.getBufferLength() + " bytes) for // region " + regionName + " key " + key); - logger.debug("{}: Sent key set response for the region {}", serverConnection.getName(), regionName); + logger.debug("{}: Sent key set response for the region {}", serverConnection.getName(), + regionName); } // bserverStats.incLong(writeDestroyResponseTimeId, // DistributionStats.getStatTime() - start); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java index 0786990..ac9901c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java @@ -43,11 +43,12 @@ public class MakePrimary extends BaseCommand { final boolean isDebugEnabled = logger.isDebugEnabled(); if (isDebugEnabled) { logger.debug("{}: Received make primary request ({} bytes) isClientReady={}: from {}", - serverConnection.getName(), clientMessage.getPayloadLength(), isClientReady, serverConnection.getSocketString()); + serverConnection.getName(), clientMessage.getPayloadLength(), isClientReady, + serverConnection.getSocketString()); } try { - serverConnection.getAcceptor().getCacheClientNotifier().makePrimary(serverConnection.getProxyID(), - isClientReady); + serverConnection.getAcceptor().getCacheClientNotifier() + .makePrimary(serverConnection.getProxyID(), isClientReady); writeReply(clientMessage, serverConnection); serverConnection.setAsTrue(RESPONDED); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java index e57385f..121ec37 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java @@ -37,8 +37,9 @@ public class PeriodicAck extends BaseCommand { throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { - logger.debug("{}: Received periodic ack request ({} bytes) from {}", serverConnection.getName(), - clientMessage.getPayloadLength(), serverConnection.getSocketString()); + logger.debug("{}: Received periodic ack request ({} bytes) from {}", + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString()); } try { int numEvents = clientMessage.getNumberOfParts(); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java index 9755410..adcfd14 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java @@ -39,11 +39,13 @@ public class Ping extends BaseCommand { private Ping() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { final boolean isDebugEnabled = logger.isDebugEnabled(); if (isDebugEnabled) { - logger.debug("{}: rcv tx: {} from {} rcvTime: {}", serverConnection.getName(), clientMessage.getTransactionId(), - serverConnection.getSocketString(), (DistributionStats.getStatTime() - start)); + logger.debug("{}: rcv tx: {} from {} rcvTime: {}", serverConnection.getName(), + clientMessage.getTransactionId(), serverConnection.getSocketString(), + (DistributionStats.getStatTime() - start)); } ClientHealthMonitor chm = ClientHealthMonitor.getInstance(); if (chm != null) @@ -53,7 +55,8 @@ public class Ping extends BaseCommand { writeReply(clientMessage, serverConnection); serverConnection.setAsTrue(RESPONDED); if (isDebugEnabled) { - logger.debug("{}: Sent ping reply to {}", serverConnection.getName(), serverConnection.getSocketString()); + logger.debug("{}: Sent ping reply to {}", serverConnection.getName(), + serverConnection.getSocketString()); } } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 d724f66..76c8184 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 @@ -94,15 +94,16 @@ public class Put extends BaseCommand { if (logger.isTraceEnabled()) { logger.trace("{}: Received put request ({} bytes) from {} for region {} key {} value {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName, key, - valuePart); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName, key, valuePart); } // Process the put request if (key == null || regionName == null) { if (key == null) { logger.warn(LocalizedMessage.create( - LocalizedStrings.Put_0_THE_INPUT_KEY_FOR_THE_PUT_REQUEST_IS_NULL, serverConnection.getName())); + LocalizedStrings.Put_0_THE_INPUT_KEY_FOR_THE_PUT_REQUEST_IS_NULL, + serverConnection.getName())); errMessage = LocalizedStrings.Put_THE_INPUT_KEY_FOR_THE_PUT_REQUEST_IS_NULL.toLocalizedString(); } @@ -113,7 +114,8 @@ 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(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -131,7 +133,7 @@ public class Put extends BaseCommand { // Invalid to 'put' a null value in an existing key logger.info(LocalizedMessage.create( LocalizedStrings.Put_0_ATTEMPTED_TO_PUT_A_NULL_VALUE_FOR_EXISTING_KEY_1, - new Object[] { serverConnection.getName(), key})); + new Object[] {serverConnection.getName(), key})); errMessage = LocalizedStrings.Put_ATTEMPTED_TO_PUT_A_NULL_VALUE_FOR_EXISTING_KEY_0.toLocalizedString(); writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage, serverConnection); @@ -142,7 +144,8 @@ public class Put extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); try { byte[] value = valuePart.getSerializedForm(); @@ -173,8 +176,8 @@ public class Put extends BaseCommand { // Create the null entry. Since the value is null, the value of the // isObject // the true after null doesn't matter and is not used. - result = region.basicBridgeCreate(key, null, true, callbackArg, serverConnection.getProxyID(), true, - new EventIDHolder(eventId), false); + result = region.basicBridgeCreate(key, null, true, callbackArg, + serverConnection.getProxyID(), true, new EventIDHolder(eventId), false); } else { // Put the entry result = region.basicBridgePut(key, value, null, isObject, callbackArg, @@ -184,7 +187,8 @@ public class Put extends BaseCommand { serverConnection.setModificationInfo(true, regionName, key); } else { StringId message = LocalizedStrings.PUT_0_FAILED_TO_PUT_ENTRY_FOR_REGION_1_KEY_2_VALUE_3; - Object[] messageArgs = new Object[] { serverConnection.getName(), regionName, key, valuePart}; + Object[] messageArgs = + new Object[] {serverConnection.getName(), regionName, key, valuePart}; String s = message.toLocalizedString(messageArgs); logger.info(s); throw new Exception(s); @@ -227,7 +231,8 @@ public class Put extends BaseCommand { serverConnection.setAsTrue(RESPONDED); if (logger.isDebugEnabled()) { logger.debug("{}: Sent put response back to {} for region {} key {} value {}", - serverConnection.getName(), serverConnection.getSocketString(), regionName, key, valuePart); + serverConnection.getName(), serverConnection.getSocketString(), regionName, key, + valuePart); } stats.incWritePutResponseTime(DistributionStats.getStatTime() - start); } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 3f9a72e..6f1583a 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 @@ -130,7 +130,8 @@ public class Put61 extends BaseCommand { } errMessage.append(putMsg); } - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -150,7 +151,8 @@ public class Put61 extends BaseCommand { logger.debug("{}:{}", serverConnection.getName(), putMsg); } errMessage.append(putMsg); - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -160,7 +162,8 @@ public class Put61 extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); try { Object value = null; @@ -199,8 +202,8 @@ public class Put61 extends BaseCommand { // Create the null entry. Since the value is null, the value of the // isObject // the true after null doesn't matter and is not used. - result = region.basicBridgeCreate(key, null, true, callbackArg, serverConnection.getProxyID(), true, - new EventIDHolder(eventId), false); + result = region.basicBridgeCreate(key, null, true, callbackArg, + serverConnection.getProxyID(), true, new EventIDHolder(eventId), false); } else { // Put the entry byte[] delta = null; @@ -213,8 +216,8 @@ public class Put61 extends BaseCommand { if (result) { serverConnection.setModificationInfo(true, regionName, key); } else { - String message = serverConnection.getName() + ": Failed to 6.1 put entry for region " + regionName - + " key " + key + " value " + valuePart; + String message = serverConnection.getName() + ": Failed to 6.1 put entry for region " + + regionName + " key " + key + " value " + valuePart; if (isDebugEnabled) { logger.debug(message); } @@ -275,7 +278,8 @@ public class Put61 extends BaseCommand { serverConnection.setAsTrue(RESPONDED); if (isDebugEnabled) { logger.debug("{}: Sent 6.1 put response back to {} for region {} key {} value {}", - serverConnection.getName(), serverConnection.getSocketString(), regionName, key, valuePart); + serverConnection.getName(), serverConnection.getSocketString(), regionName, key, + valuePart); } stats.incWritePutResponseTime(DistributionStats.getStatTime() - start); } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 581aec6..a078372 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 @@ -146,7 +146,8 @@ public class Put65 extends BaseCommand { logger.debug( "{}: Received {}put request ({} bytes) from {} for region {} key {} txId {} posdup: {}", serverConnection.getName(), (isDelta ? " delta " : " "), clientMessage.getPayloadLength(), - serverConnection.getSocketString(), regionName, key, clientMessage.getTransactionId(), clientMessage.isRetry()); + serverConnection.getSocketString(), regionName, key, clientMessage.getTransactionId(), + clientMessage.isRetry()); } // Process the put request @@ -165,7 +166,8 @@ public class Put65 extends BaseCommand { } errMessage.append(putMsg); } - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -185,7 +187,8 @@ public class Put65 extends BaseCommand { logger.debug("{}:{}", serverConnection.getName(), putMsg); } errMessage.append(putMsg); - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -194,8 +197,8 @@ public class Put65 extends BaseCommand { long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventIDHolder clientEvent = - new EventIDHolder(new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId)); + EventIDHolder clientEvent = new EventIDHolder( + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId)); Breadcrumbs.setEventId(clientEvent.getEventId()); @@ -267,8 +270,8 @@ public class Put65 extends BaseCommand { } // invoke basicBridgePutIfAbsent anyway to ensure that the event is distributed to all // servers - bug #51664 - region.basicBridgePutIfAbsent(key, value, isObject, callbackArg, serverConnection.getProxyID(), - true, clientEvent); + region.basicBridgePutIfAbsent(key, value, isObject, callbackArg, + serverConnection.getProxyID(), true, clientEvent); oldValue = null; } else { oldValue = region.basicBridgePutIfAbsent(key, value, isObject, callbackArg, @@ -356,8 +359,8 @@ public class Put65 extends BaseCommand { // Create the null entry. Since the value is null, the value of the // isObject // the true after null doesn't matter and is not used. - result = region.basicBridgeCreate(key, null, true, callbackArg, serverConnection.getProxyID(), true, - clientEvent, false); + result = region.basicBridgeCreate(key, null, true, callbackArg, + serverConnection.getProxyID(), true, clientEvent, false); if (clientMessage.isRetry() && clientEvent.isConcurrencyConflict() && clientEvent.getVersionTag() != null) { result = true; @@ -372,7 +375,8 @@ public class Put65 extends BaseCommand { if (isDelta) { delta = valuePart.getSerializedForm(); } - TXManagerImpl txMgr = (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager(); + TXManagerImpl txMgr = + (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager(); // bug 43068 - use create() if in a transaction and op is CREATE if (txMgr.getTXState() != null && operation.isCreate()) { result = region.basicBridgeCreate(key, (byte[]) value, isObject, callbackArg, @@ -393,8 +397,8 @@ public class Put65 extends BaseCommand { if (result) { serverConnection.setModificationInfo(true, regionName, key); } else { - String message = serverConnection.getName() + ": Failed to put entry for region " + regionName - + " key " + key + " value " + valuePart; + String message = serverConnection.getName() + ": Failed to put entry for region " + + regionName + " key " + key + " value " + valuePart; if (isDebugEnabled) { logger.debug(message); } @@ -443,8 +447,8 @@ public class Put65 extends BaseCommand { if (region instanceof PartitionedRegion) { PartitionedRegion pr = (PartitionedRegion) region; if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) { - writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, sendOldValue, oldValueIsObject, oldValue, - pr.getNetworkHopType(), clientEvent.getVersionTag()); + writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, sendOldValue, + oldValueIsObject, oldValue, pr.getNetworkHopType(), clientEvent.getVersionTag()); pr.clearNetworkHopData(); } else { writeReply(clientMessage, serverConnection, sendOldValue, oldValueIsObject, oldValue, @@ -457,7 +461,8 @@ public class Put65 extends BaseCommand { serverConnection.setAsTrue(RESPONDED); if (isDebugEnabled) { logger.debug("{}: Sent put response back to {} for region {} key {} value {}", - serverConnection.getName(), serverConnection.getSocketString(), regionName, key, valuePart); + serverConnection.getName(), serverConnection.getSocketString(), regionName, key, + valuePart); } stats.incWritePutResponseTime(DistributionStats.getStatTime() - start); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 281f737..ba8b145 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 @@ -91,7 +91,8 @@ public class PutAll extends BaseCommand { .toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), putAllMsg); errMessage.append(putAllMsg); - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -108,7 +109,8 @@ public class PutAll extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); // part 2: number of keys numberOfKeysPart = clientMessage.getPart(2); @@ -126,7 +128,8 @@ public class PutAll extends BaseCommand { .toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), putAllMsg); errMessage.append(putAllMsg); - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -138,7 +141,8 @@ public class PutAll extends BaseCommand { .toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), putAllMsg); errMessage.append(putAllMsg); - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -155,8 +159,9 @@ public class PutAll extends BaseCommand { // isObjectMap.put(key, new Boolean(isObject)); } // for - if (clientMessage.getNumberOfParts() == (3 + 2 * numberOfKeys + 1)) {// it means optional timeout has - // been added + if (clientMessage.getNumberOfParts() == (3 + 2 * numberOfKeys + 1)) {// it means optional + // timeout has + // been added int timeout = clientMessage.getPart(3 + 2 * numberOfKeys).getInt(); serverConnection.setRequestSpecificTimeout(timeout); } @@ -179,7 +184,8 @@ public class PutAll extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug("{}: Received putAll request ({} bytes) from {} for region {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName); } region.basicBridgePutAll(map, Collections.<Object, VersionTag>emptyMap(), @@ -188,7 +194,8 @@ public class PutAll extends BaseCommand { if (region instanceof PartitionedRegion) { PartitionedRegion pr = (PartitionedRegion) region; if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) { - writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, pr.getNetworkHopType()); + writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, + pr.getNetworkHopType()); pr.clearNetworkHopData(); replyWithMetaData = true; } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 ae2de09..fb2bdb8 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 @@ -97,7 +97,8 @@ public class PutAll70 extends BaseCommand { .toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), putAllMsg); errMessage.append(putAllMsg); - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -114,7 +115,8 @@ public class PutAll70 extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); // part 2: invoke callbacks (used by import) Part callbacksPart = clientMessage.getPart(2); @@ -137,7 +139,8 @@ public class PutAll70 extends BaseCommand { .toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), putAllMsg); errMessage.append(putAllMsg); - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -149,7 +152,8 @@ public class PutAll70 extends BaseCommand { .toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), putAllMsg); errMessage.append(putAllMsg); - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -198,8 +202,9 @@ public class PutAll70 extends BaseCommand { // isObjectMap.put(key, new Boolean(isObject)); } // for - if (clientMessage.getNumberOfParts() == (4 + 2 * numberOfKeys + 1)) {// it means optional timeout has - // been added + if (clientMessage.getNumberOfParts() == (4 + 2 * numberOfKeys + 1)) {// it means optional + // timeout has + // been added int timeout = clientMessage.getPart(4 + 2 * numberOfKeys).getInt(); serverConnection.setRequestSpecificTimeout(timeout); } @@ -231,11 +236,12 @@ public class PutAll70 extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug("{}: Received putAll request ({} bytes) from {} for region {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName); } - response = region.basicBridgePutAll(map, retryVersions, serverConnection.getProxyID(), eventId, - skipCallbacks, null); + response = region.basicBridgePutAll(map, retryVersions, serverConnection.getProxyID(), + eventId, skipCallbacks, null); if (!region.getConcurrencyChecksEnabled()) { // the client only needs this if versioning is being used response = null; @@ -244,7 +250,8 @@ public class PutAll70 extends BaseCommand { if (region instanceof PartitionedRegion) { PartitionedRegion pr = (PartitionedRegion) region; if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) { - writeReplyWithRefreshMetadata(clientMessage, response, serverConnection, pr, pr.getNetworkHopType()); + writeReplyWithRefreshMetadata(clientMessage, response, serverConnection, pr, + pr.getNetworkHopType()); pr.clearNetworkHopData(); replyWithMetaData = true; } @@ -279,8 +286,8 @@ public class PutAll70 extends BaseCommand { stats.incProcessPutAllTime(start - oldStart); } if (logger.isDebugEnabled()) { - logger.debug("{}: Sending putAll70 response back to {} for region {}: {}", serverConnection.getName(), - serverConnection.getSocketString(), regionName, response); + logger.debug("{}: Sending putAll70 response back to {} for region {}: {}", + serverConnection.getName(), serverConnection.getSocketString(), regionName, response); } // Starting in 7.0.1 we do not send the keys back if (response != null && Version.GFE_70.compareTo(serverConnection.getClientVersion()) < 0) { http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 aed5926..c6c26f7 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 @@ -111,7 +111,8 @@ public class PutAll80 extends BaseCommand { .toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), putAllMsg); errMessage.append(putAllMsg); - writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -131,7 +132,8 @@ public class PutAll80 extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); Breadcrumbs.setEventId(eventId); @@ -152,10 +154,11 @@ public class PutAll80 extends BaseCommand { if (logger.isDebugEnabled()) { StringBuilder buffer = new StringBuilder(); - buffer.append(serverConnection.getName()).append(": Received ").append(this.putAllClassName()) - .append(" request from ").append(serverConnection.getSocketString()).append(" for region ") - .append(regionName).append(callbackArg != null ? (" callbackArg " + callbackArg) : "") - .append(" with ").append(numberOfKeys).append(" entries."); + buffer.append(serverConnection.getName()).append(": Received ") + .append(this.putAllClassName()).append(" request from ") + .append(serverConnection.getSocketString()).append(" for region ").append(regionName) + .append(callbackArg != null ? (" callbackArg " + callbackArg) : "").append(" with ") + .append(numberOfKeys).append(" entries."); logger.debug(buffer.toString()); } // building the map @@ -171,7 +174,8 @@ public class PutAll80 extends BaseCommand { .toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), putAllMsg); errMessage.append(putAllMsg); - writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, + errMessage.toString(), serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -183,7 +187,8 @@ public class PutAll80 extends BaseCommand { .toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), putAllMsg); errMessage.append(putAllMsg); - writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, + errMessage.toString(), serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -232,9 +237,10 @@ public class PutAll80 extends BaseCommand { // isObjectMap.put(key, new Boolean(isObject)); } // for - if (clientMessage.getNumberOfParts() == (BASE_PART_COUNT + 2 * numberOfKeys + 1)) {// it means optional - // timeout has been - // added + if (clientMessage.getNumberOfParts() == (BASE_PART_COUNT + 2 * numberOfKeys + 1)) {// it means + // optional + // timeout has been + // added int timeout = clientMessage.getPart(BASE_PART_COUNT + 2 * numberOfKeys).getInt(); serverConnection.setRequestSpecificTimeout(timeout); } @@ -265,8 +271,8 @@ public class PutAll80 extends BaseCommand { */ } - response = region.basicBridgePutAll(map, retryVersions, serverConnection.getProxyID(), eventId, - skipCallbacks, callbackArg); + response = region.basicBridgePutAll(map, retryVersions, serverConnection.getProxyID(), + eventId, skipCallbacks, callbackArg); if (!region.getConcurrencyChecksEnabled() || clientIsEmpty || !clientHasCCEnabled) { // the client only needs this if versioning is being used and the client // has storage @@ -281,7 +287,8 @@ public class PutAll80 extends BaseCommand { if (region instanceof PartitionedRegion) { PartitionedRegion pr = (PartitionedRegion) region; if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) { - writeReplyWithRefreshMetadata(clientMessage, response, serverConnection, pr, pr.getNetworkHopType()); + writeReplyWithRefreshMetadata(clientMessage, response, serverConnection, pr, + pr.getNetworkHopType()); pr.clearNetworkHopData(); replyWithMetaData = true; } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java index dc3de67..ea5c875 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java @@ -51,16 +51,17 @@ public class PutUserCredentials extends BaseCommand { writeResponse(uniqueId, null, clientMessage, false, serverConnection); } catch (GemFireSecurityException gfse) { if (serverConnection.getSecurityLogWriter().warningEnabled()) { - serverConnection.getSecurityLogWriter().warning(LocalizedStrings.ONE_ARG, serverConnection.getName() - + ": Security exception: " + gfse.toString() - + (gfse.getCause() != null ? ", caused by: " + gfse.getCause().toString() : "")); + serverConnection.getSecurityLogWriter().warning(LocalizedStrings.ONE_ARG, + serverConnection.getName() + ": Security exception: " + gfse.toString() + + (gfse.getCause() != null ? ", caused by: " + gfse.getCause().toString() + : "")); } writeException(clientMessage, gfse, false, serverConnection); } catch (Exception ex) { if (serverConnection.getLogWriter().warningEnabled()) { serverConnection.getLogWriter().warning( LocalizedStrings.CacheClientNotifier_AN_EXCEPTION_WAS_THROWN_FOR_CLIENT_0_1, - new Object[] { serverConnection.getProxyID(), ""}, ex); + new Object[] {serverConnection.getProxyID(), ""}, ex); } writeException(clientMessage, ex, false, serverConnection); } finally { http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 8b5b35e..b7d2810 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 @@ -88,7 +88,8 @@ public class Query extends BaseCommandQuery { } } - processQuery(clientMessage, query, queryString, regionNames, start, null, queryContext, serverConnection, true); + processQuery(clientMessage, query, queryString, regionNames, start, null, queryContext, + serverConnection, true); } catch (QueryInvalidException e) { throw new QueryInvalidException(e.getMessage() + queryString); } catch (QueryExecutionLowMemoryException e) { http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/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 97f5d56..e52fa3f 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 @@ -61,8 +61,9 @@ public class Query651 extends BaseCommandQuery { int params = clientMessage.getPart(1).getInt(); // Number of parameters. // In case of native client there will be extra two parameters at 2 and 3 index. int paramStartIndex = 2; - if (clientMessage.getNumberOfParts() > (1 /* type */ + 1 /* query string */ + 1 /* params length */ - + params /* number of params */)) { + if (clientMessage + .getNumberOfParts() > (1 /* type */ + 1 /* query string */ + 1 /* params length */ + + params /* number of params */)) { int timeout = clientMessage.getPart(3).getInt(); serverConnection.setRequestSpecificTimeout(timeout); paramStartIndex = 4; @@ -85,8 +86,8 @@ public class Query651 extends BaseCommandQuery { } if (logger.isDebugEnabled()) { - logger.debug("{}: Received query request from {} queryString: {}{}", serverConnection.getName(), - serverConnection.getSocketString(), queryString, + logger.debug("{}: Received query request from {} queryString: {}{}", + serverConnection.getName(), serverConnection.getSocketString(), queryString, (queryParams != null ? (" with num query parameters :" + queryParams.length) : "")); } try { @@ -128,7 +129,8 @@ public class Query651 extends BaseCommandQuery { } } - processQueryUsingParams(clientMessage, query, queryString, regionNames, start, null, queryContext, serverConnection, true, queryParams); + processQueryUsingParams(clientMessage, query, queryString, regionNames, start, null, + queryContext, serverConnection, true, queryParams); } catch (QueryInvalidException e) { throw new QueryInvalidException(e.getMessage() + queryString); }
