http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java index 610af43..ab19954 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java @@ -35,7 +35,6 @@ 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.internal.security.SecurityService; public class ClearRegion extends BaseCommand { @@ -48,8 +47,8 @@ public class ClearRegion extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null, callbackArgPart = null; String regionName = null; Object callbackArg = null; @@ -116,7 +115,7 @@ public class ClearRegion extends BaseCommand { try { // Clear the region - securityService.authorizeRegionWrite(regionName); + this.securityService.authorizeRegionWrite(regionName); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java index ae95cae..cf9c470 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java @@ -20,7 +20,6 @@ package org.apache.geode.internal.cache.tier.sockets.command; import org.apache.geode.internal.cache.tier.Command; import org.apache.geode.internal.cache.tier.sockets.*; import org.apache.geode.distributed.internal.DistributionStats; -import org.apache.geode.internal.security.SecurityService; import java.io.IOException; @@ -36,8 +35,8 @@ public class ClientReady extends BaseCommand { private ClientReady() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { CacheServerStats stats = serverConnection.getCacheServerStats(); { long oldStart = start; http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java index ed050bd..21f0cad 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java @@ -27,7 +27,6 @@ import org.apache.geode.internal.cache.tier.sockets.CacheServerStats; 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.security.SecurityService; public class CloseConnection extends BaseCommand { @@ -40,8 +39,8 @@ public class CloseConnection extends BaseCommand { private CloseConnection() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { CacheServerStats stats = serverConnection.getCacheServerStats(); long oldStart = start; boolean respondToClient = serverConnection.getClientVersion().compareTo(Version.GFE_90) >= 0; http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java index c9987db..366d77c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java @@ -17,7 +17,9 @@ */ package org.apache.geode.internal.cache.tier.sockets.command; +import org.apache.geode.cache.CommitConflictException; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.i18n.LogWriterI18n; import org.apache.geode.internal.Assert; import org.apache.geode.internal.cache.TXCommitMessage; import org.apache.geode.internal.cache.TXId; @@ -28,7 +30,7 @@ import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.cache.tier.sockets.BaseCommand; import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; -import org.apache.geode.internal.security.SecurityService; +import org.apache.geode.internal.i18n.LocalizedStrings; import java.io.IOException; @@ -48,8 +50,8 @@ public class CommitCommand extends BaseCommand { private CommitCommand() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { serverConnection.setAsTrue(REQUIRES_RESPONSE); TXManagerImpl txMgr = (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager(); InternalDistributedMember client = http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java index d7a1b2b..9cb2528 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java @@ -17,7 +17,9 @@ package org.apache.geode.internal.cache.tier.sockets.command; import java.io.IOException; import org.apache.geode.distributed.internal.DistributionStats; +import org.apache.geode.i18n.LogWriterI18n; 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.MessageType; import org.apache.geode.internal.cache.tier.sockets.BaseCommand; @@ -28,7 +30,6 @@ 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.internal.security.SecurityService; import org.apache.geode.security.NotAuthorizedException; public class ContainsKey extends BaseCommand { @@ -50,8 +51,8 @@ public class ContainsKey extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { Part regionNamePart = null; Part keyPart = null; String regionName = null; @@ -116,7 +117,7 @@ public class ContainsKey extends BaseCommand { } try { - securityService.authorizeRegionRead(regionName, key.toString()); + this.securityService.authorizeRegionRead(regionName, key.toString()); } catch (NotAuthorizedException ex) { writeException(clientMessage, ex, false, serverConnection); serverConnection.setAsTrue(RESPONDED); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java index 03e798c..b2ce055 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java @@ -12,6 +12,9 @@ * 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; @@ -30,7 +33,6 @@ 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.internal.security.SecurityService; import org.apache.geode.security.NotAuthorizedException; public class ContainsKey66 extends BaseCommand { @@ -53,8 +55,8 @@ public class ContainsKey66 extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { Part regionNamePart = null, keyPart = null; String regionName = null; Object key = null; @@ -118,7 +120,7 @@ public class ContainsKey66 extends BaseCommand { } try { - securityService.authorizeRegionRead(regionName, key.toString()); + this.securityService.authorizeRegionRead(regionName, key.toString()); } catch (NotAuthorizedException ex) { writeException(clientMessage, ex, false, serverConnection); serverConnection.setAsTrue(RESPONDED); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java index 2be4724..0dec596 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java @@ -12,6 +12,9 @@ * 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; @@ -27,7 +30,6 @@ 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.internal.security.SecurityService; import org.apache.geode.security.NotAuthorizedException; public class CreateRegion extends BaseCommand { @@ -39,8 +41,8 @@ public class CreateRegion extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { Part regionNamePart = null; String regionName = null; serverConnection.setAsTrue(REQUIRES_RESPONSE); @@ -98,7 +100,7 @@ public class CreateRegion extends BaseCommand { } try { - securityService.authorizeDataManage(); + this.securityService.authorizeDataManage(); } catch (NotAuthorizedException ex) { writeException(clientMessage, ex, false, serverConnection); serverConnection.setAsTrue(RESPONDED); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java index 5bf9d07..3daaec5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java @@ -22,7 +22,6 @@ import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.cache.tier.sockets.*; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; -import org.apache.geode.internal.security.SecurityService; import java.io.IOException; @@ -38,8 +37,8 @@ public class Default extends BaseCommand { private Default() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { // requiresResponse = true; NOT NEEDED... ALWAYS SEND ERROR RESPONSE logger.fatal( http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java index cdbab80..83ab394 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java @@ -37,7 +37,6 @@ 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.internal.security.SecurityService; import org.apache.geode.security.GemFireSecurityException; public class Destroy extends BaseCommand { @@ -49,8 +48,7 @@ public class Destroy extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long startparam) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startparam) throws IOException, InterruptedException { long start = startparam; @@ -137,7 +135,7 @@ public class Destroy extends BaseCommand { try { // for integrated security - securityService.authorizeRegionWrite(regionName, key.toString()); + this.securityService.authorizeRegionWrite(regionName, key.toString()); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java index c8b794a..3aebbb5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java @@ -42,7 +42,6 @@ import org.apache.geode.internal.cache.versions.VersionTag; 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.internal.security.SecurityService; import org.apache.geode.internal.util.Breadcrumbs; import org.apache.geode.security.GemFireSecurityException; @@ -95,8 +94,8 @@ public class Destroy65 extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart; Part keyPart; Part callbackArgPart; @@ -108,7 +107,7 @@ public class Destroy65 extends BaseCommand { String regionName = null; Object callbackArg = null, key = null; - StringBuilder errMessage = new StringBuilder(); + StringBuffer errMessage = new StringBuffer(); CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); CacheServerStats stats = serverConnection.getCacheServerStats(); serverConnection.setAsTrue(REQUIRES_RESPONSE); @@ -225,7 +224,7 @@ public class Destroy65 extends BaseCommand { try { // for integrated security - securityService.authorizeRegionWrite(regionName, key.toString()); + this.securityService.authorizeRegionWrite(regionName, key.toString()); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java index baa2f3f..886994e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java @@ -23,6 +23,7 @@ import org.apache.geode.distributed.DistributedSystemDisconnectedException; import org.apache.geode.distributed.internal.DistributionStats; import org.apache.geode.internal.cache.EventID; 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.MessageType; import org.apache.geode.internal.cache.tier.sockets.BaseCommand; @@ -44,13 +45,13 @@ public class DestroyRegion extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null, callbackArgPart = null; String regionName = null; Object callbackArg = null; Part eventPart = null; - StringBuilder errMessage = new StringBuilder(); + StringBuffer errMessage = new StringBuffer(); CacheServerStats stats = serverConnection.getCacheServerStats(); serverConnection.setAsTrue(REQUIRES_RESPONSE); @@ -126,7 +127,7 @@ public class DestroyRegion extends BaseCommand { try { // user needs to have data:manage on all regions in order to destory a particular region - securityService.authorizeDataManage(); + this.securityService.authorizeDataManage(); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java index 2bfbdb5..c146d27 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java @@ -47,7 +47,6 @@ 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.internal.security.SecurityService; /** * This is the base command which read the parts for the MessageType.EXECUTE_FUNCTION.<br> @@ -65,8 +64,8 @@ public class ExecuteFunction extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { Object function = null; Object args = null; MemberMappedArgument memberMappedArg = null; @@ -74,8 +73,8 @@ public class ExecuteFunction extends BaseCommand { try { hasResult = clientMessage.getPart(0).getSerializedForm()[0]; if (hasResult == 1) { - serverConnection.setAsTrue(REQUIRES_RESPONSE); - serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + servConn.setAsTrue(REQUIRES_RESPONSE); + servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } function = clientMessage.getPart(1).getStringOrObject(); args = clientMessage.getPart(2).getObject(); @@ -89,8 +88,8 @@ public class ExecuteFunction extends BaseCommand { LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, serverConnection); - serverConnection.setAsTrue(RESPONDED); + writeChunkedException(clientMessage, exception, servConn); + servConn.setAsTrue(RESPONDED); return; } } @@ -98,8 +97,8 @@ public class ExecuteFunction extends BaseCommand { final String message = LocalizedStrings.ExecuteFunction_THE_INPUT_FUNCTION_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString(); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } @@ -111,8 +110,8 @@ public class ExecuteFunction extends BaseCommand { if (functionObject == null) { final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } } else { @@ -121,21 +120,21 @@ public class ExecuteFunction extends BaseCommand { FunctionStats stats = FunctionStats.getFunctionStats(functionObject.getId()); - securityService.authorizeDataWrite(); + this.securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); + AuthorizeRequest authzRequest = servConn.getAuthzRequest(); ExecuteFunctionOperationContext executeContext = null; if (authzRequest != null) { executeContext = authzRequest.executeFunctionAuthorize(functionObject.getId(), null, null, args, functionObject.optimizeForWrite()); } - ChunkedMessage m = serverConnection.getFunctionResponseMessage(); + ChunkedMessage m = servConn.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); ResultSender resultSender = new ServerToClientFunctionResultSender(m, - MessageType.EXECUTE_FUNCTION_RESULT, serverConnection, functionObject, executeContext); + MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext); - InternalDistributedMember localVM = (InternalDistributedMember) serverConnection.getCache() + InternalDistributedMember localVM = (InternalDistributedMember) servConn.getCache() .getDistributedSystem().getDistributedMember(); FunctionContext context = null; @@ -146,17 +145,17 @@ public class ExecuteFunction extends BaseCommand { } else { context = new FunctionContextImpl(functionObject.getId(), args, resultSender); } - HandShake handShake = (HandShake) serverConnection.getHandshake(); + HandShake handShake = (HandShake) servConn.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(0); try { long startExecution = stats.startTime(); stats.startFunctionExecution(functionObject.hasResult()); if (logger.isDebugEnabled()) { - logger.debug("Executing Function on Server: " + serverConnection.toString() - + "with context :" + context.toString()); + logger.debug("Executing Function on Server: " + servConn.toString() + "with context :" + + context.toString()); } - InternalCache cache = serverConnection.getCache(); + InternalCache cache = servConn.getCache(); HeapMemoryMonitor hmm = ((InternalResourceManager) cache.getResourceManager()).getHeapMonitor(); if (functionObject.optimizeForWrite() && cache != null && hmm.getState().isCritical() @@ -184,7 +183,7 @@ public class ExecuteFunction extends BaseCommand { function), ioException); String message = LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString(); - sendException(hasResult, clientMessage, message, serverConnection, ioException); + sendException(hasResult, clientMessage, message, servConn, ioException); } catch (InternalFunctionInvocationTargetException internalfunctionException) { // Fix for #44709: User should not be aware of // InternalFunctionInvocationTargetException. No instance of @@ -202,30 +201,29 @@ public class ExecuteFunction extends BaseCommand { new Object[] {function}), internalfunctionException); } final String message = internalfunctionException.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, internalfunctionException); + sendException(hasResult, clientMessage, message, servConn, internalfunctionException); } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), e); final String message = e.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, e); + sendException(hasResult, clientMessage, message, servConn, e); } } - private void sendException(byte hasResult, Message msg, String message, - ServerConnection serverConnection, Throwable e) throws IOException { + private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + Throwable e) throws IOException { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, serverConnection, e); - serverConnection.setAsTrue(RESPONDED); + writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e); + servConn.setAsTrue(RESPONDED); } } - private void sendError(byte hasResult, Message msg, String message, - ServerConnection serverConnection) throws IOException { + private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + throws IOException { if (hasResult == 1) { - writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, - serverConnection); - serverConnection.setAsTrue(RESPONDED); + writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, servConn); + servConn.setAsTrue(RESPONDED); } } http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java index 167aa3b..23d5b18 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java @@ -48,7 +48,6 @@ 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.internal.security.SecurityService; /** * @since GemFire 6.5 @@ -64,8 +63,8 @@ public class ExecuteFunction65 extends BaseCommand { ExecuteFunction65() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { Object function = null; Object args = null; MemberMappedArgument memberMappedArg = null; @@ -89,8 +88,8 @@ public class ExecuteFunction65 extends BaseCommand { hasResult = functionState; } if (hasResult == 1) { - serverConnection.setAsTrue(REQUIRES_RESPONSE); - serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + servConn.setAsTrue(REQUIRES_RESPONSE); + servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } function = clientMessage.getPart(1).getStringOrObject(); args = clientMessage.getPart(2).getObject(); @@ -104,8 +103,8 @@ public class ExecuteFunction65 extends BaseCommand { LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, serverConnection); - serverConnection.setAsTrue(RESPONDED); + writeChunkedException(clientMessage, exception, servConn); + servConn.setAsTrue(RESPONDED); return; } } @@ -113,8 +112,8 @@ public class ExecuteFunction65 extends BaseCommand { final String message = LocalizedStrings.ExecuteFunction_THE_INPUT_FUNCTION_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString(); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } @@ -126,8 +125,8 @@ public class ExecuteFunction65 extends BaseCommand { if (functionObject == null) { final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } else { byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(), @@ -140,8 +139,8 @@ public class ExecuteFunction65 extends BaseCommand { String message = LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } } @@ -151,21 +150,21 @@ public class ExecuteFunction65 extends BaseCommand { FunctionStats stats = FunctionStats.getFunctionStats(functionObject.getId()); - securityService.authorizeDataWrite(); + this.securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); + AuthorizeRequest authzRequest = servConn.getAuthzRequest(); ExecuteFunctionOperationContext executeContext = null; if (authzRequest != null) { executeContext = authzRequest.executeFunctionAuthorize(functionObject.getId(), null, null, args, functionObject.optimizeForWrite()); } - ChunkedMessage m = serverConnection.getFunctionResponseMessage(); + ChunkedMessage m = servConn.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); ResultSender resultSender = new ServerToClientFunctionResultSender65(m, - MessageType.EXECUTE_FUNCTION_RESULT, serverConnection, functionObject, executeContext); + MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext); - InternalDistributedMember localVM = (InternalDistributedMember) serverConnection.getCache() + InternalDistributedMember localVM = (InternalDistributedMember) servConn.getCache() .getDistributedSystem().getDistributedMember(); FunctionContext context = null; @@ -175,17 +174,16 @@ public class ExecuteFunction65 extends BaseCommand { } else { context = new FunctionContextImpl(functionObject.getId(), args, resultSender, isReexecute); } - HandShake handShake = (HandShake) serverConnection.getHandshake(); + HandShake handShake = (HandShake) servConn.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(0); try { long startExecution = stats.startTime(); stats.startFunctionExecution(functionObject.hasResult()); if (logger.isDebugEnabled()) { - logger.debug("Executing Function on Server: {} with context: {}", serverConnection, - context); + logger.debug("Executing Function on Server: {} with context: {}", servConn, context); } - InternalCache cache = serverConnection.getCache(); + InternalCache cache = servConn.getCache(); HeapMemoryMonitor hmm = ((InternalResourceManager) cache.getResourceManager()).getHeapMonitor(); if (functionObject.optimizeForWrite() && cache != null && hmm.getState().isCritical() @@ -196,7 +194,7 @@ public class ExecuteFunction65 extends BaseCommand { .toLocalizedString(new Object[] {functionObject.getId(), sm}), sm); - sendException(hasResult, clientMessage, e.getMessage(), serverConnection, e); + sendException(hasResult, clientMessage, e.getMessage(), servConn, e); return; } functionObject.execute(context); @@ -223,7 +221,7 @@ public class ExecuteFunction65 extends BaseCommand { function), ioException); String message = LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString(); - sendException(hasResult, clientMessage, message, serverConnection, ioException); + sendException(hasResult, clientMessage, message, servConn, ioException); } catch (InternalFunctionInvocationTargetException internalfunctionException) { // Fix for #44709: User should not be aware of // InternalFunctionInvocationTargetException. No instance of @@ -239,30 +237,29 @@ public class ExecuteFunction65 extends BaseCommand { new Object[] {function}), internalfunctionException); } final String message = internalfunctionException.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, internalfunctionException); + sendException(hasResult, clientMessage, message, servConn, internalfunctionException); } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), e); final String message = e.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, e); + sendException(hasResult, clientMessage, message, servConn, e); } } - private void sendException(byte hasResult, Message msg, String message, - ServerConnection serverConnection, Throwable e) throws IOException { + private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + Throwable e) throws IOException { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, serverConnection, e); - serverConnection.setAsTrue(RESPONDED); + writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e); + servConn.setAsTrue(RESPONDED); } } - private void sendError(byte hasResult, Message msg, String message, - ServerConnection serverConnection) throws IOException { + private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + throws IOException { if (hasResult == 1) { - writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, - serverConnection); - serverConnection.setAsTrue(RESPONDED); + writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, servConn); + servConn.setAsTrue(RESPONDED); } } http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java index e212b50..46302bc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java @@ -60,7 +60,6 @@ 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.internal.security.SecurityService; /** * @since GemFire 6.6 @@ -88,8 +87,8 @@ public class ExecuteFunction66 extends BaseCommand { ExecuteFunction66() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { Object function = null; Object args = null; MemberMappedArgument memberMappedArg = null; @@ -104,7 +103,7 @@ public class ExecuteFunction66 extends BaseCommand { byte[] bytes = clientMessage.getPart(0).getSerializedForm(); functionState = bytes[0]; if (bytes.length >= 5 - && serverConnection.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) { + && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) { functionTimeout = Part.decodeInt(bytes, 1); } @@ -122,8 +121,8 @@ public class ExecuteFunction66 extends BaseCommand { hasResult = functionState; } if (hasResult == 1) { - serverConnection.setAsTrue(REQUIRES_RESPONSE); - serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + servConn.setAsTrue(REQUIRES_RESPONSE); + servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } function = clientMessage.getPart(1).getStringOrObject(); args = clientMessage.getPart(2).getObject(); @@ -141,11 +140,11 @@ public class ExecuteFunction66 extends BaseCommand { LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, serverConnection); + writeChunkedException(clientMessage, exception, servConn); } else { - writeException(clientMessage, exception, false, serverConnection); + writeException(clientMessage, exception, false, servConn); } - serverConnection.setAsTrue(RESPONDED); + servConn.setAsTrue(RESPONDED); return; } @@ -154,8 +153,8 @@ public class ExecuteFunction66 extends BaseCommand { LocalizedStrings.ExecuteFunction_THE_INPUT_FUNCTION_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString(); logger.warn(LocalizedMessage.create(LocalizedStrings.TWO_ARG_COLON, - new Object[] {serverConnection.getName(), message})); - sendError(hasResult, clientMessage, message, serverConnection); + new Object[] {servConn.getName(), message})); + sendError(hasResult, clientMessage, message, servConn); return; } @@ -167,8 +166,8 @@ public class ExecuteFunction66 extends BaseCommand { if (functionObject == null) { final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } else { byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(), @@ -181,8 +180,8 @@ public class ExecuteFunction66 extends BaseCommand { String message = LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } } @@ -192,21 +191,21 @@ public class ExecuteFunction66 extends BaseCommand { FunctionStats stats = FunctionStats.getFunctionStats(functionObject.getId()); - securityService.authorizeDataWrite(); + this.securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); + AuthorizeRequest authzRequest = servConn.getAuthzRequest(); ExecuteFunctionOperationContext executeContext = null; if (authzRequest != null) { executeContext = authzRequest.executeFunctionAuthorize(functionObject.getId(), null, null, args, functionObject.optimizeForWrite()); } - ChunkedMessage m = serverConnection.getFunctionResponseMessage(); + ChunkedMessage m = servConn.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); ServerToClientFunctionResultSender resultSender = new ServerToClientFunctionResultSender65(m, - MessageType.EXECUTE_FUNCTION_RESULT, serverConnection, functionObject, executeContext); + MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext); - InternalDistributedMember localVM = (InternalDistributedMember) serverConnection.getCache() + InternalDistributedMember localVM = (InternalDistributedMember) servConn.getCache() .getDistributedSystem().getDistributedMember(); FunctionContext context = null; @@ -216,15 +215,14 @@ public class ExecuteFunction66 extends BaseCommand { } else { context = new FunctionContextImpl(functionObject.getId(), args, resultSender, isReexecute); } - HandShake handShake = (HandShake) serverConnection.getHandshake(); + HandShake handShake = (HandShake) servConn.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(functionTimeout); try { if (logger.isDebugEnabled()) { - logger.debug("Executing Function on Server: {} with context: {}", serverConnection, - context); + logger.debug("Executing Function on Server: {} with context: {}", servConn, context); } - InternalCache cache = serverConnection.getCache(); + InternalCache cache = servConn.getCache(); HeapMemoryMonitor hmm = ((InternalResourceManager) cache.getResourceManager()).getHeapMonitor(); if (functionObject.optimizeForWrite() && cache != null && hmm.getState().isCritical() @@ -235,10 +233,10 @@ public class ExecuteFunction66 extends BaseCommand { .toLocalizedString(new Object[] {functionObject.getId(), sm}), sm); - sendException(hasResult, clientMessage, e.getMessage(), serverConnection, e); + sendException(hasResult, clientMessage, e.getMessage(), servConn, e); return; } - /* + /** * if cache is null, then either cache has not yet been created on this node or it is a * shutdown scenario. */ @@ -255,7 +253,7 @@ public class ExecuteFunction66 extends BaseCommand { } if (!functionObject.hasResult()) { - writeReply(clientMessage, serverConnection); + writeReply(clientMessage, servConn); } } catch (FunctionException functionException) { stats.endFunctionExecutionWithException(functionObject.hasResult()); @@ -272,7 +270,7 @@ public class ExecuteFunction66 extends BaseCommand { function), ioException); String message = LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString(); - sendException(hasResult, clientMessage, message, serverConnection, ioException); + sendException(hasResult, clientMessage, message, servConn, ioException); } catch (InternalFunctionInvocationTargetException internalfunctionException) { // Fix for #44709: User should not be aware of // InternalFunctionInvocationTargetException. No instance of @@ -290,13 +288,13 @@ public class ExecuteFunction66 extends BaseCommand { new Object[] {function}), internalfunctionException); } final String message = internalfunctionException.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, internalfunctionException); + sendException(hasResult, clientMessage, message, servConn, internalfunctionException); } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), e); final String message = e.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, e); + sendException(hasResult, clientMessage, message, servConn, e); } } @@ -386,9 +384,9 @@ public class ExecuteFunction66 extends BaseCommand { }; if (dm == null) { - /* + /** * Executing the function in its own thread pool as FunctionExecution Thread pool of - * DistributionManager is not yet available. + * DisributionManager is not yet available. */ execService.execute(functionExecution); } else { @@ -399,25 +397,24 @@ public class ExecuteFunction66 extends BaseCommand { stats.endFunctionExecution(startExecution, fn.hasResult()); } - private void sendException(byte hasResult, Message msg, String message, - ServerConnection serverConnection, Throwable e) throws IOException { + private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + Throwable e) throws IOException { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, serverConnection, e); + writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e); } else { - writeException(msg, e, false, serverConnection); + writeException(msg, e, false, servConn); } - serverConnection.setAsTrue(RESPONDED); + servConn.setAsTrue(RESPONDED); } - private void sendError(byte hasResult, Message msg, String message, - ServerConnection serverConnection) throws IOException { + private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + throws IOException { if (hasResult == 1) { - writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, - serverConnection); + writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, servConn); } else { - writeErrorResponse(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, serverConnection); + writeErrorResponse(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, servConn); } - serverConnection.setAsTrue(RESPONDED); + servConn.setAsTrue(RESPONDED); } } http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java index 5299ce4..09fe20e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java @@ -36,7 +36,6 @@ 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.security.SecurityService; /** * @@ -52,9 +51,9 @@ public class ExecuteFunction70 extends ExecuteFunction66 { private ExecuteFunction70() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { - super.cmdExecute(clientMessage, serverConnection, securityService, start); + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { + super.cmdExecute(clientMessage, serverConnection, start); } @Override http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java index 73eff40..82a378d 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java @@ -43,7 +43,6 @@ 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.internal.security.SecurityService; /** * This is the base command which reads the parts for the MessageType.EXECUTE_REGION_FUNCTION and @@ -64,8 +63,8 @@ public class ExecuteRegionFunction extends BaseCommand { private ExecuteRegionFunction() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { String regionName = null; Object function = null; Object args = null; @@ -73,12 +72,12 @@ public class ExecuteRegionFunction extends BaseCommand { Set filter = null; byte hasResult = 0; int filterSize = 0, partNumber = 0; - CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); + CachedRegionHelper crHelper = servConn.getCachedRegionHelper(); try { hasResult = clientMessage.getPart(0).getSerializedForm()[0]; if (hasResult == 1) { - serverConnection.setAsTrue(REQUIRES_RESPONSE); - serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + servConn.setAsTrue(REQUIRES_RESPONSE); + servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } regionName = clientMessage.getPart(1).getString(); function = clientMessage.getPart(2).getStringOrObject(); @@ -104,8 +103,8 @@ public class ExecuteRegionFunction extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, serverConnection); - serverConnection.setAsTrue(RESPONDED); + writeChunkedException(clientMessage, exception, servConn); + servConn.setAsTrue(RESPONDED); return; } } @@ -121,8 +120,8 @@ public class ExecuteRegionFunction extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString("region"); } - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } @@ -131,12 +130,12 @@ public class ExecuteRegionFunction extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST .toLocalizedString(regionName); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } - HandShake handShake = (HandShake) serverConnection.getHandshake(); + HandShake handShake = (HandShake) servConn.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(0); ServerToClientFunctionResultSender resultSender = null; @@ -148,18 +147,18 @@ public class ExecuteRegionFunction extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } } else { functionObject = (Function) function; } - securityService.authorizeDataWrite(); + this.securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); + AuthorizeRequest authzRequest = servConn.getAuthzRequest(); final String functionName = functionObject.getId(); final String regionPath = region.getFullPath(); ExecuteFunctionOperationContext executeContext = null; @@ -170,11 +169,10 @@ public class ExecuteRegionFunction extends BaseCommand { // Construct execution AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region); - ChunkedMessage m = serverConnection.getFunctionResponseMessage(); + ChunkedMessage m = servConn.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); - resultSender = - new ServerToClientFunctionResultSender(m, MessageType.EXECUTE_REGION_FUNCTION_RESULT, - serverConnection, functionObject, executeContext); + resultSender = new ServerToClientFunctionResultSender(m, + MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext); if (execution instanceof PartitionedRegionFunctionExecutor) { execution = new PartitionedRegionFunctionExecutor((PartitionedRegion) region, filter, args, @@ -186,7 +184,7 @@ public class ExecuteRegionFunction extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug("Executing Function: {} on Server: {} with Execution: {}", - functionObject.getId(), serverConnection, execution); + functionObject.getId(), servConn, execution); } if (hasResult == 1) { if (function instanceof String) { @@ -207,7 +205,7 @@ public class ExecuteRegionFunction extends BaseCommand { function), ioe); final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY .toLocalizedString(); - sendException(hasResult, clientMessage, message, serverConnection, ioe); + sendException(hasResult, clientMessage, message, servConn, ioe); } catch (InternalFunctionInvocationTargetException internalfunctionException) { // Fix for #44709: User should not be aware of // InternalFunctionInvocationTargetException. No instance of @@ -225,42 +223,42 @@ public class ExecuteRegionFunction extends BaseCommand { new Object[] {function}), internalfunctionException); } final String message = internalfunctionException.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, internalfunctionException); + sendException(hasResult, clientMessage, message, servConn, internalfunctionException); } catch (FunctionException fe) { logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), fe); String message = fe.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, fe); + sendException(hasResult, clientMessage, message, servConn, fe); } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), e); String message = e.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, e); + sendException(hasResult, clientMessage, message, servConn, e); } finally { handShake.setClientReadTimeout(earlierClientReadTimeout); } } - private void sendException(byte hasResult, Message msg, String message, - ServerConnection serverConnection, Throwable e) throws IOException { + private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + Throwable e) throws IOException { synchronized (msg) { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, serverConnection, e); - serverConnection.setAsTrue(RESPONDED); + writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e); + servConn.setAsTrue(RESPONDED); } } } - private void sendError(byte hasResult, Message msg, String message, - ServerConnection serverConnection) throws IOException { + private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + throws IOException { synchronized (msg) { if (hasResult == 1) { writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, - serverConnection); - serverConnection.setAsTrue(RESPONDED); + servConn); + servConn.setAsTrue(RESPONDED); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java index 8e1e01b..12919d0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java @@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import java.io.IOException; +import java.io.Serializable; import java.util.HashSet; import java.util.Set; @@ -45,7 +46,6 @@ 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.internal.security.SecurityService; /** * @@ -63,8 +63,8 @@ public class ExecuteRegionFunction61 extends BaseCommand { private ExecuteRegionFunction61() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { String regionName = null; Object function = null; Object args = null; @@ -75,12 +75,12 @@ public class ExecuteRegionFunction61 extends BaseCommand { int removedNodesSize = 0; Set removedNodesSet = null; int filterSize = 0, partNumber = 0; - CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); + CachedRegionHelper crHelper = servConn.getCachedRegionHelper(); try { hasResult = clientMessage.getPart(0).getSerializedForm()[0]; if (hasResult == 1) { - serverConnection.setAsTrue(REQUIRES_RESPONSE); - serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + servConn.setAsTrue(REQUIRES_RESPONSE); + servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } regionName = clientMessage.getPart(1).getString(); function = clientMessage.getPart(2).getStringOrObject(); @@ -119,8 +119,8 @@ public class ExecuteRegionFunction61 extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, serverConnection); - serverConnection.setAsTrue(RESPONDED); + writeChunkedException(clientMessage, exception, servConn); + servConn.setAsTrue(RESPONDED); return; } } @@ -136,8 +136,8 @@ public class ExecuteRegionFunction61 extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString("region"); } - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } else { Region region = crHelper.getRegion(regionName); @@ -145,11 +145,11 @@ public class ExecuteRegionFunction61 extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST .toLocalizedString(regionName); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } - HandShake handShake = (HandShake) serverConnection.getHandshake(); + HandShake handShake = (HandShake) servConn.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(0); ServerToClientFunctionResultSender resultSender = null; @@ -161,15 +161,15 @@ public class ExecuteRegionFunction61 extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } } else { functionObject = (Function) function; } // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); + AuthorizeRequest authzRequest = servConn.getAuthzRequest(); final String functionName = functionObject.getId(); final String regionPath = region.getFullPath(); ExecuteFunctionOperationContext executeContext = null; @@ -180,11 +180,10 @@ public class ExecuteRegionFunction61 extends BaseCommand { // Construct execution AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region); - ChunkedMessage m = serverConnection.getFunctionResponseMessage(); + ChunkedMessage m = servConn.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); - resultSender = - new ServerToClientFunctionResultSender(m, MessageType.EXECUTE_REGION_FUNCTION_RESULT, - serverConnection, functionObject, executeContext); + resultSender = new ServerToClientFunctionResultSender(m, + MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext); if (execution instanceof PartitionedRegionFunctionExecutor) { @@ -200,7 +199,7 @@ public class ExecuteRegionFunction61 extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug("Executing Function: {} on Server: {} with Execution: {}", - functionObject.getId(), serverConnection, execution); + functionObject.getId(), servConn, execution); } if (hasResult == 1) { if (function instanceof String) { @@ -222,7 +221,7 @@ public class ExecuteRegionFunction61 extends BaseCommand { final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY .toLocalizedString(); - sendException(hasResult, clientMessage, message, serverConnection, ioe); + sendException(hasResult, clientMessage, message, servConn, ioe); } catch (FunctionException fe) { String message = fe.getMessage(); @@ -257,7 +256,7 @@ public class ExecuteRegionFunction61 extends BaseCommand { logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), fe); - sendException(hasResult, clientMessage, message, serverConnection, fe); + sendException(hasResult, clientMessage, message, servConn, fe); } } catch (Exception e) { @@ -265,7 +264,7 @@ public class ExecuteRegionFunction61 extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), e); String message = e.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, e); + sendException(hasResult, clientMessage, message, servConn, e); } finally { @@ -274,20 +273,19 @@ public class ExecuteRegionFunction61 extends BaseCommand { } } - private void sendException(byte hasResult, Message msg, String message, - ServerConnection serverConnection, Throwable e) throws IOException { + private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + Throwable e) throws IOException { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, serverConnection, e); - serverConnection.setAsTrue(RESPONDED); + writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e); + servConn.setAsTrue(RESPONDED); } } - private void sendError(byte hasResult, Message msg, String message, - ServerConnection serverConnection) throws IOException { + private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + throws IOException { if (hasResult == 1) { - writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, - serverConnection); - serverConnection.setAsTrue(RESPONDED); + writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, servConn); + servConn.setAsTrue(RESPONDED); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/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 391d9d0..3be907b 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 @@ -45,7 +45,6 @@ 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.internal.security.SecurityService; /** * @since GemFire 6.5 @@ -61,8 +60,8 @@ public class ExecuteRegionFunction65 extends BaseCommand { private ExecuteRegionFunction65() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { String regionName = null; Object function = null; Object args = null; @@ -73,7 +72,7 @@ public class ExecuteRegionFunction65 extends BaseCommand { int removedNodesSize = 0; Set<Object> removedNodesSet = null; int filterSize = 0, partNumber = 0; - CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); + CachedRegionHelper crHelper = servConn.getCachedRegionHelper(); byte functionState = 0; try { functionState = clientMessage.getPart(0).getSerializedForm()[0]; @@ -83,8 +82,8 @@ public class ExecuteRegionFunction65 extends BaseCommand { hasResult = functionState; } if (hasResult == 1) { - serverConnection.setAsTrue(REQUIRES_RESPONSE); - serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + servConn.setAsTrue(REQUIRES_RESPONSE); + servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } regionName = clientMessage.getPart(1).getString(); function = clientMessage.getPart(2).getStringOrObject(); @@ -123,8 +122,8 @@ public class ExecuteRegionFunction65 extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, serverConnection); - serverConnection.setAsTrue(RESPONDED); + writeChunkedException(clientMessage, exception, servConn); + servConn.setAsTrue(RESPONDED); return; } } @@ -140,8 +139,8 @@ public class ExecuteRegionFunction65 extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString("region"); } - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } @@ -150,12 +149,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("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } - HandShake handShake = (HandShake) serverConnection.getHandshake(); + HandShake handShake = (HandShake) servConn.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(0); ServerToClientFunctionResultSender resultSender = null; @@ -167,8 +166,8 @@ public class ExecuteRegionFunction65 extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } else { byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(), @@ -181,8 +180,8 @@ public class ExecuteRegionFunction65 extends BaseCommand { String message = LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } } @@ -190,10 +189,10 @@ public class ExecuteRegionFunction65 extends BaseCommand { functionObject = (Function) function; } - securityService.authorizeDataWrite(); + this.securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); + AuthorizeRequest authzRequest = servConn.getAuthzRequest(); final String functionName = functionObject.getId(); final String regionPath = region.getFullPath(); ExecuteFunctionOperationContext executeContext = null; @@ -204,11 +203,10 @@ public class ExecuteRegionFunction65 extends BaseCommand { // Construct execution AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region); - ChunkedMessage m = serverConnection.getFunctionResponseMessage(); + ChunkedMessage m = servConn.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); - resultSender = - new ServerToClientFunctionResultSender65(m, MessageType.EXECUTE_REGION_FUNCTION_RESULT, - serverConnection, functionObject, executeContext); + resultSender = new ServerToClientFunctionResultSender65(m, + MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext); if (execution instanceof PartitionedRegionFunctionExecutor) { @@ -224,8 +222,7 @@ public class ExecuteRegionFunction65 extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "Executing Function: {} on Server: {} with Execution: {} functionState={} reexecute={} hasResult={}", - functionObject.getId(), serverConnection, execution, functionState, isReExecute, - hasResult); + functionObject.getId(), servConn, execution, functionState, isReExecute, hasResult); } if (hasResult == 1) { if (function instanceof String) { @@ -266,7 +263,7 @@ public class ExecuteRegionFunction65 extends BaseCommand { function), ioe); final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY .toLocalizedString(); - sendException(hasResult, clientMessage, message, serverConnection, ioe); + sendException(hasResult, clientMessage, message, servConn, ioe); } catch (FunctionException fe) { String message = fe.getMessage(); @@ -302,7 +299,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, serverConnection, fe); + sendException(hasResult, clientMessage, message, servConn, fe); } } catch (Exception e) { @@ -310,37 +307,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, serverConnection, e); + sendException(hasResult, clientMessage, message, servConn, e); } finally { handShake.setClientReadTimeout(earlierClientReadTimeout); } } - private void sendException(byte hasResult, Message msg, String message, - ServerConnection serverConnection, Throwable e) throws IOException { + private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + Throwable e) throws IOException { synchronized (msg) { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, message, serverConnection, e); - serverConnection.setAsTrue(RESPONDED); + writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e); + servConn.setAsTrue(RESPONDED); } } } - private void sendError(byte hasResult, Message msg, String message, - ServerConnection serverConnection) throws IOException { + private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + throws IOException { synchronized (msg) { if (hasResult == 1) { writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, - serverConnection); - serverConnection.setAsTrue(RESPONDED); + servConn); + servConn.setAsTrue(RESPONDED); } } } protected static void writeFunctionResponseException(Message origMsg, int messageType, - String message, ServerConnection serverConnection, Throwable e) throws IOException { - ChunkedMessage functionResponseMsg = serverConnection.getFunctionResponseMessage(); - ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage(); + String message, ServerConnection servConn, Throwable e) throws IOException { + ChunkedMessage functionResponseMsg = servConn.getFunctionResponseMessage(); + ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage(); int numParts = 0; if (functionResponseMsg.headerHasBeenSent()) { if (e instanceof FunctionException @@ -359,13 +356,13 @@ public class ExecuteRegionFunction65 extends BaseCommand { numParts = 2; } if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk while reply in progress: ", - serverConnection.getName(), e); + logger.debug("{}: Sending exception chunk while reply in progress: ", servConn.getName(), + e); } - functionResponseMsg.setServerConnection(serverConnection); + functionResponseMsg.setServerConnection(servConn); functionResponseMsg.setLastChunkAndNumParts(true, numParts); // functionResponseMsg.setLastChunk(true); - functionResponseMsg.sendChunk(serverConnection); + functionResponseMsg.sendChunk(servConn); } else { chunkedResponseMsg.setMessageType(messageType); chunkedResponseMsg.setTransactionId(origMsg.getTransactionId()); @@ -386,11 +383,11 @@ public class ExecuteRegionFunction65 extends BaseCommand { numParts = 2; } if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk: ", serverConnection.getName(), e); + logger.debug("{}: Sending exception chunk: ", servConn.getName(), e); } - chunkedResponseMsg.setServerConnection(serverConnection); + chunkedResponseMsg.setServerConnection(servConn); chunkedResponseMsg.setLastChunkAndNumParts(true, numParts); - chunkedResponseMsg.sendChunk(serverConnection); + chunkedResponseMsg.sendChunk(servConn); } } }
