Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D375D200CA3 for ; Thu, 1 Jun 2017 19:35:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D2427160BC1; Thu, 1 Jun 2017 17:35:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 861AC160BC4 for ; Thu, 1 Jun 2017 19:35:38 +0200 (CEST) Received: (qmail 63859 invoked by uid 500); 1 Jun 2017 17:35:32 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 63591 invoked by uid 99); 1 Jun 2017 17:35:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2017 17:35:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 40F84E110C; Thu, 1 Jun 2017 17:35:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.apache.org Date: Thu, 01 Jun 2017 17:35:35 -0000 Message-Id: In-Reply-To: <16ef3fa84e9d4545b76840c620e5da9e@git.apache.org> References: <16ef3fa84e9d4545b76840c620e5da9e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] geode git commit: Fix issues archived-at: Thu, 01 Jun 2017 17:35:41 -0000 Fix issues Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/7f1bd1e0 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/7f1bd1e0 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/7f1bd1e0 Branch: refs/heads/feature/GEODE-2632-19 Commit: 7f1bd1e0a330b168801cbc2778acbc73c25c78e1 Parents: d5dc97c Author: Kirk Lund Authored: Thu Jun 1 10:35:19 2017 -0700 Committer: Kirk Lund Committed: Thu Jun 1 10:35:19 2017 -0700 ---------------------------------------------------------------------- .../cache/tier/sockets/BaseCommandQuery.java | 66 +++++++-------- .../cache/tier/sockets/CacheClientNotifier.java | 39 ++++----- .../internal/cache/tier/sockets/HandShake.java | 14 ++-- .../cache/tier/sockets/ServerConnection.java | 2 +- .../cache/tier/sockets/command/ClearRegion.java | 2 +- .../cache/tier/sockets/command/ContainsKey.java | 2 +- .../tier/sockets/command/ContainsKey66.java | 5 +- .../tier/sockets/command/CreateRegion.java | 5 +- .../cache/tier/sockets/command/Destroy.java | 2 +- .../cache/tier/sockets/command/Destroy65.java | 4 +- .../tier/sockets/command/DestroyRegion.java | 4 +- .../tier/sockets/command/ExecuteFunction.java | 50 ++++++------ .../tier/sockets/command/ExecuteFunction65.java | 56 ++++++------- .../tier/sockets/command/ExecuteFunction66.java | 72 ++++++++-------- .../sockets/command/ExecuteRegionFunction.java | 54 ++++++------ .../command/ExecuteRegionFunction61.java | 50 ++++++------ .../command/ExecuteRegionFunction65.java | 74 ++++++++--------- .../command/ExecuteRegionFunction66.java | 86 ++++++++++---------- .../command/ExecuteRegionFunctionSingleHop.java | 76 ++++++++--------- .../cache/tier/sockets/command/Get70.java | 4 +- .../cache/tier/sockets/command/GetAll.java | 10 +-- .../cache/tier/sockets/command/GetAll651.java | 12 +-- .../cache/tier/sockets/command/GetAll70.java | 10 +-- .../sockets/command/GetAllWithCallback.java | 12 +-- .../cache/tier/sockets/command/Invalidate.java | 4 +- .../cache/tier/sockets/command/KeySet.java | 2 +- .../cache/tier/sockets/command/Put.java | 5 +- .../cache/tier/sockets/command/Put61.java | 7 +- .../cache/tier/sockets/command/Put65.java | 4 +- .../cache/tier/sockets/command/PutAll.java | 7 +- .../cache/tier/sockets/command/PutAll70.java | 8 +- .../cache/tier/sockets/command/PutAll80.java | 7 +- .../cache/tier/sockets/command/Query.java | 2 +- .../cache/tier/sockets/command/Query651.java | 2 +- .../tier/sockets/command/RegisterInterest.java | 4 +- .../sockets/command/RegisterInterest61.java | 7 +- .../sockets/command/RegisterInterestList.java | 22 +++-- .../sockets/command/RegisterInterestList61.java | 20 ++--- .../sockets/command/RegisterInterestList66.java | 58 +++---------- .../cache/tier/sockets/command/RemoveAll.java | 9 +- .../cache/tier/sockets/command/Request.java | 5 +- .../cache/tier/sockets/command/Size.java | 6 +- .../sockets/command/UnregisterInterest.java | 8 +- .../sockets/command/UnregisterInterestList.java | 2 +- .../internal/cache/xmlcache/CacheCreation.java | 7 ++ .../CreateAlterDestroyRegionCommands.java | 2 +- .../internal/cli/commands/DataCommands.java | 2 +- .../internal/cli/commands/DeployCommands.java | 2 + .../cli/functions/DataCommandFunction.java | 8 +- .../cli/remote/MemberCommandService.java | 13 +-- .../tier/sockets/ServerConnectionTest.java | 7 +- .../tier/sockets/command/ContainsKey66Test.java | 10 +-- .../tier/sockets/command/ContainsKeyTest.java | 10 +-- .../tier/sockets/command/CreateRegionTest.java | 10 +-- .../tier/sockets/command/Destroy65Test.java | 10 +-- .../tier/sockets/command/DestroyRegionTest.java | 10 +-- .../cache/tier/sockets/command/DestroyTest.java | 10 +-- .../sockets/command/ExecuteFunction65Test.java | 10 +-- .../sockets/command/ExecuteFunction66Test.java | 10 +-- .../sockets/command/ExecuteFunctionTest.java | 10 +-- .../cache/tier/sockets/command/Get70Test.java | 10 +-- .../tier/sockets/command/GetAll651Test.java | 10 +-- .../tier/sockets/command/GetAll70Test.java | 10 +-- .../cache/tier/sockets/command/GetAllTest.java | 10 +-- .../sockets/command/GetAllWithCallbackTest.java | 10 +-- ...tClientPartitionAttributesCommand66Test.java | 2 +- ...GetClientPartitionAttributesCommandTest.java | 2 +- .../tier/sockets/command/InvalidateTest.java | 10 +-- .../cache/tier/sockets/command/KeySetTest.java | 10 +-- .../cache/tier/sockets/command/Put61Test.java | 10 +-- .../cache/tier/sockets/command/Put65Test.java | 10 +-- .../cache/tier/sockets/command/PutTest.java | 10 +-- .../sockets/command/RegisterInterest61Test.java | 10 +-- .../command/RegisterInterestList61Test.java | 10 +-- .../command/RegisterInterestList66Test.java | 10 +-- .../command/RegisterInterestListTest.java | 10 +-- .../sockets/command/RegisterInterestTest.java | 10 +-- .../tier/sockets/command/RemoveAllTest.java | 10 +-- .../cache/tier/sockets/command/RequestTest.java | 10 +-- .../sockets/command/UnregisterInterestTest.java | 10 +-- .../security/IntegratedSecurityServiceTest.java | 2 +- ...atedSecurityServiceWithIniFileJUnitTest.java | 6 +- .../CacheFactoryWithSecurityObjectTest.java | 16 ++-- .../PDXGfshPostProcessorOnRemoteServerTest.java | 2 +- .../security/PDXPostProcessorDUnitTest.java | 9 +- .../test/dunit/rules/ServerStarterRule.java | 8 +- .../cache/tier/sockets/command/CloseCQ.java | 11 ++- .../cache/tier/sockets/command/ExecuteCQ.java | 6 +- .../cache/tier/sockets/command/ExecuteCQ61.java | 9 +- .../cache/tier/sockets/command/GetCQStats.java | 8 +- .../tier/sockets/command/GetDurableCQs.java | 4 +- .../cache/tier/sockets/command/MonitorCQ.java | 10 +-- .../cache/tier/sockets/command/StopCQ.java | 10 +-- .../security/CQPDXPostProcessorDUnitTest.java | 2 +- .../apache/geode/tools/pulse/tests/Server.java | 15 ++-- .../tools/pulse/tests/rules/ServerRule.java | 6 +- .../web/security/RestSecurityService.java | 16 +++- 97 files changed, 641 insertions(+), 714 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java index adf702a..b0c66e1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java @@ -42,47 +42,35 @@ import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequestPP; +import org.apache.geode.internal.security.SecurityService; public abstract class BaseCommandQuery extends BaseCommand { /** * Process the give query and sends the resulset back to the client. * - * @param msg - * @param query - * @param queryString - * @param regionNames - * @param start - * @param cqQuery - * @param queryContext - * @param servConn * @return true if successful execution false in case of failure. - * @throws IOException */ protected boolean processQuery(Message msg, Query query, String queryString, Set regionNames, - long start, ServerCQ cqQuery, QueryOperationContext queryContext, ServerConnection servConn, - boolean sendResults) throws IOException, InterruptedException { + long start, ServerCQ cqQuery, QueryOperationContext queryContext, + ServerConnection servConn, + boolean sendResults, + final SecurityService securityService) throws IOException, InterruptedException { return processQueryUsingParams(msg, query, queryString, regionNames, start, cqQuery, - queryContext, servConn, sendResults, null); + queryContext, servConn, sendResults, null, securityService); } /** * Process the give query and sends the resulset back to the client. * - * @param msg - * @param query - * @param queryString - * @param regionNames - * @param start - * @param cqQuery - * @param queryContext - * @param servConn * @return true if successful execution false in case of failure. - * @throws IOException */ protected boolean processQueryUsingParams(Message msg, Query query, String queryString, - Set regionNames, long start, ServerCQ cqQuery, QueryOperationContext queryContext, - ServerConnection servConn, boolean sendResults, Object[] params) + Set regionNames, long start, ServerCQ cqQuery, + QueryOperationContext queryContext, + ServerConnection servConn, boolean sendResults, + Object[] params, + final SecurityService securityService) throws IOException, InterruptedException { ChunkedMessage queryResponseMsg = servConn.getQueryResponseMessage(); CacheServerStats stats = servConn.getCacheServerStats(); @@ -103,7 +91,7 @@ public abstract class BaseCommandQuery extends BaseCommand { try { // integrated security for (Object regionName : regionNames) { - this.securityService.authorizeRegionRead(regionName.toString()); + securityService.authorizeRegionRead(regionName.toString()); } // Execute query @@ -226,7 +214,7 @@ public abstract class BaseCommandQuery extends BaseCommand { // send it as a part of ObjectPartList if (hasSerializedObjects) { sendResultsAsObjectPartList(numberOfChunks, servConn, selectResults.asList(), isStructs, - collectionType, queryString, cqQuery, sendCqResultsWithKey, sendResults); + collectionType, queryString, cqQuery, sendCqResultsWithKey, sendResults, securityService); } else { sendResultsAsObjectArray(selectResults, numberOfChunks, servConn, isStructs, collectionType, queryString, cqQuery, sendCqResultsWithKey, sendResults); @@ -314,7 +302,8 @@ public abstract class BaseCommandQuery extends BaseCommand { } protected void sendCqResponse(int msgType, String msgStr, int txId, Throwable e, - ServerConnection servConn) throws IOException { + ServerConnection servConn, + final SecurityService securityService) throws IOException { ChunkedMessage cqMsg = servConn.getChunkedResponseMessage(); if (logger.isDebugEnabled()) { logger.debug("CQ Response message :{}", msgStr); @@ -455,8 +444,10 @@ public abstract class BaseCommandQuery extends BaseCommand { } private void sendResultsAsObjectPartList(int numberOfChunks, ServerConnection servConn, List objs, - boolean isStructs, CollectionType collectionType, String queryString, ServerCQ cqQuery, - boolean sendCqResultsWithKey, boolean sendResults) throws IOException { + boolean isStructs, CollectionType collectionType, + String queryString, ServerCQ cqQuery, + boolean sendCqResultsWithKey, boolean sendResults, + final SecurityService securityService) throws IOException { int resultIndex = 0; Object result = null; for (int j = 0; j < numberOfChunks; j++) { @@ -499,7 +490,7 @@ public abstract class BaseCommandQuery extends BaseCommand { result = objs.get(resultIndex); } if (sendResults) { - addToObjectPartList(serializedObjs, result, collectionType, false, servConn, isStructs); + addToObjectPartList(serializedObjs, result, collectionType, false, servConn, isStructs, securityService); } resultIndex++; } @@ -517,14 +508,16 @@ public abstract class BaseCommandQuery extends BaseCommand { } private void addToObjectPartList(ObjectPartList serializedObjs, Object res, - CollectionType collectionType, boolean lastChunk, ServerConnection servConn, - boolean isStructs) throws IOException { + CollectionType collectionType, boolean lastChunk, + ServerConnection servConn, + boolean isStructs, + final SecurityService securityService) throws IOException { if (isStructs && (res instanceof Struct)) { Object[] values = ((Struct) res).getFieldValues(); // create another ObjectPartList for the struct ObjectPartList serializedValueObjs = new ObjectPartList(values.length, false); for (Object value : values) { - addObjectToPartList(serializedValueObjs, null, value); + addObjectToPartList(serializedValueObjs, null, value, securityService); } serializedObjs.addPart(null, serializedValueObjs, ObjectPartList.OBJECT, null); } else if (res instanceof Object[]) {// for CQ key-value pairs @@ -534,15 +527,16 @@ public abstract class BaseCommandQuery extends BaseCommand { for (int i = 0; i < values.length; i += 2) { Object key = values[i]; Object value = values[i + 1]; - addObjectToPartList(serializedValueObjs, key, value); + addObjectToPartList(serializedValueObjs, key, value, securityService); } serializedObjs.addPart(null, serializedValueObjs, ObjectPartList.OBJECT, null); } else { // for deserialized objects - addObjectToPartList(serializedObjs, null, res); + addObjectToPartList(serializedObjs, null, res, securityService); } } - private void addObjectToPartList(ObjectPartList objPartList, Object key, Object value) { + private void addObjectToPartList(ObjectPartList objPartList, Object key, Object value, + final SecurityService securityService) { Object object = value; boolean isObject = true; if (value instanceof CachedDeserializable) { @@ -551,7 +545,7 @@ public abstract class BaseCommandQuery extends BaseCommand { isObject = false; } - object = this.securityService.postProcess(null, key, object, isObject); + object = securityService.postProcess(null, key, object, isObject); if (key != null) { objPartList.addPart(null, key, ObjectPartList.OBJECT, null); } http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java index fd5154f..532f116 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java @@ -17,9 +17,7 @@ package org.apache.geode.internal.cache.tier.sockets; import static org.apache.geode.distributed.ConfigurationProperties.*; import java.io.BufferedOutputStream; -import java.io.DataInput; import java.io.DataInputStream; -import java.io.DataOutput; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Method; @@ -70,12 +68,7 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.distributed.internal.DM; import org.apache.geode.distributed.internal.DistributionConfig; -import org.apache.geode.distributed.internal.DistributionManager; -import org.apache.geode.distributed.internal.HighPriorityDistributionMessage; import org.apache.geode.distributed.internal.InternalDistributedSystem; -import org.apache.geode.distributed.internal.MessageWithReply; -import org.apache.geode.distributed.internal.ReplyMessage; -import org.apache.geode.distributed.internal.ReplyProcessor21; import org.apache.geode.internal.ClassLoadUtil; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.statistics.DummyStatisticsFactory; @@ -337,14 +330,14 @@ public class CacheClientNotifier { proxy = registerClient(socket, proxyID, proxy, isPrimary, clientConflation, clientVersion, acceptorId, notifyBySubscription); - Properties credentials = HandShake.readCredentials(dis, dos, system); + Properties credentials = HandShake.readCredentials(dis, dos, system, this.cache.getSecurityService()); if (credentials != null && proxy != null) { if (securityLogWriter.fineEnabled()) { securityLogWriter .fine("CacheClientNotifier: verifying credentials for proxyID: " + proxyID); } Object subject = HandShake.verifyCredentials(authenticator, credentials, - system.getSecurityProperties(), this.logWriter, this.securityLogWriter, member); + system.getSecurityProperties(), this.logWriter, this.securityLogWriter, member, this.cache.getSecurityService()); if (subject instanceof Principal) { Principal principal = (Principal) subject; if (securityLogWriter.fineEnabled()) { @@ -460,7 +453,7 @@ public class CacheClientNotifier { proxyId.getDurableId()); } l_proxy = new CacheClientProxy(this, socket, proxyId, isPrimary, clientConflation, - clientVersion, acceptorId, notifyBySubscription); + clientVersion, acceptorId, notifyBySubscription, this.cache.getSecurityService()); successful = this.initializeProxy(l_proxy); } else { if (proxy.isPrimary()) { @@ -538,7 +531,7 @@ public class CacheClientNotifier { if (toCreateNewProxy) { // Create the new proxy for this non-durable client l_proxy = new CacheClientProxy(this, socket, proxyId, isPrimary, clientConflation, - clientVersion, acceptorId, notifyBySubscription); + clientVersion, acceptorId, notifyBySubscription, this.cache.getSecurityService()); successful = this.initializeProxy(l_proxy); } } @@ -963,7 +956,7 @@ public class CacheClientNotifier { private void singletonRouteClientMessage(Conflatable conflatable, Collection filterClients) { - this._cache.getCancelCriterion().checkCancelInProgress(null); // bug #43942 - client notified + this.cache.getCancelCriterion().checkCancelInProgress(null); // bug #43942 - client notified // but no p2p distribution List deadProxies = null; @@ -1845,15 +1838,15 @@ public class CacheClientNotifier { * @return this CacheClientNotifier's InternalCache */ protected InternalCache getCache() { // TODO:SYNC: looks wrong - if (this._cache != null && this._cache.isClosed()) { + if (this.cache != null && this.cache.isClosed()) { InternalCache cache = GemFireCacheImpl.getInstance(); if (cache != null) { - this._cache = cache; + this.cache = cache; this.logWriter = cache.getInternalLogWriter(); this.securityLogWriter = cache.getSecurityInternalLogWriter(); } } - return this._cache; + return this.cache; } /** @@ -2016,7 +2009,7 @@ public class CacheClientNotifier { if (!isCompiledQueryCleanupThreadStarted) { long period = DefaultQuery.TEST_COMPILED_QUERY_CLEAR_TIME > 0 ? DefaultQuery.TEST_COMPILED_QUERY_CLEAR_TIME : DefaultQuery.COMPILED_QUERY_CLEAR_TIME; - _cache.getCCPTimer().scheduleAtFixedRate(task, period, period); + cache.getCCPTimer().scheduleAtFixedRate(task, period, period); } isCompiledQueryCleanupThreadStarted = true; } @@ -2063,7 +2056,7 @@ public class CacheClientNotifier { if (logger.isDebugEnabled()) { logger.debug("Scheduling client ping task with period={} ms", CLIENT_PING_TASK_PERIOD); } - CacheClientNotifier.this._cache.getCCPTimer().scheduleAtFixedRate(this.clientPingTask, + CacheClientNotifier.this.cache.getCCPTimer().scheduleAtFixedRate(this.clientPingTask, CLIENT_PING_TASK_PERIOD, CLIENT_PING_TASK_PERIOD); } @@ -2098,10 +2091,10 @@ public class CacheClientNotifier { /** * The GemFire InternalCache. Note that since this is a singleton class you should - * not use a direct reference to _cache in CacheClientNotifier code. Instead, you should always + * not use a direct reference to cache in CacheClientNotifier code. Instead, you should always * use getCache() */ - private InternalCache _cache; + private InternalCache cache; private InternalLogWriter logWriter; @@ -2216,8 +2209,8 @@ public class CacheClientNotifier { // lazily initialize haContainer in case this CCN instance was created by a gateway receiver if (overflowAttributesList != null && !HARegionQueue.HA_EVICTION_POLICY_NONE.equals(overflowAttributesList.get(0))) { - haContainer = new HAContainerRegion(_cache.getRegion(Region.SEPARATOR - + CacheServerImpl.clientMessagesRegion(_cache, (String) overflowAttributesList.get(0), + haContainer = new HAContainerRegion(cache.getRegion(Region.SEPARATOR + + CacheServerImpl.clientMessagesRegion(cache, (String) overflowAttributesList.get(0), ((Integer) overflowAttributesList.get(1)).intValue(), ((Integer) overflowAttributesList.get(2)).intValue(), (String) overflowAttributesList.get(3), (Boolean) overflowAttributesList.get(4)))); @@ -2246,10 +2239,10 @@ public class CacheClientNotifier { } /** - * @param _cache the _cache to set + * @param _cache the cache to set */ private void setCache(InternalCache _cache) { - this._cache = _cache; + this.cache = _cache; } private class ExpireBlackListTask extends PoolTask { http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java index 54dd8ea..87c490d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java @@ -300,7 +300,7 @@ public class HandShake implements ClientHandShake { // Hitesh if (this.clientVersion.compareTo(Version.GFE_65) < 0 || communicationMode == Acceptor.GATEWAY_TO_GATEWAY) { - this.credentials = readCredentials(dis, dos, sys); + this.credentials = readCredentials(dis, dos, sys, this.securityService); } else { this.credentials = this.readCredential(dis, dos, sys); } @@ -1089,7 +1089,7 @@ public class HandShake implements ClientHandShake { // Initialize the keys when either the host is a client that has // non-blank setting for DH symmetric algo, or this is a server // that has authenticator defined. - if ((dhSKAlgo != null && dhSKAlgo.length() > 0) || securityService.isClientSecurityRequired()) { + if ((dhSKAlgo != null && dhSKAlgo.length() > 0) /*|| securityService.isClientSecurityRequired()*/) { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH"); DHParameterSpec dhSpec = new DHParameterSpec(dhP, dhG, dhL); keyGen.initialize(dhSpec); @@ -1540,7 +1540,7 @@ public class HandShake implements ClientHandShake { // This assumes that authentication is the last piece of info in handshake public static Properties readCredentials(DataInputStream dis, DataOutputStream dos, - DistributedSystem system) throws GemFireSecurityException, IOException { + DistributedSystem system, SecurityService securityService) throws GemFireSecurityException, IOException { boolean requireAuthentication = securityService.isClientSecurityRequired(); Properties credentials = null; @@ -1675,7 +1675,7 @@ public class HandShake implements ClientHandShake { */ public static Object verifyCredentials(String authenticatorMethod, Properties credentials, Properties securityProperties, InternalLogWriter logWriter, - InternalLogWriter securityLogWriter, DistributedMember member) + InternalLogWriter securityLogWriter, DistributedMember member, SecurityService securityService) throws AuthenticationRequiredException, AuthenticationFailedException { if (!AcceptorImpl.isAuthenticationRequired()) { @@ -1708,7 +1708,7 @@ public class HandShake implements ClientHandShake { String methodName = this.system.getProperties().getProperty(SECURITY_CLIENT_AUTHENTICATOR); return verifyCredentials(methodName, this.credentials, this.system.getSecurityProperties(), (InternalLogWriter) this.system.getLogWriter(), - (InternalLogWriter) this.system.getSecurityLogWriter(), this.id.getDistributedMember()); + (InternalLogWriter) this.system.getSecurityLogWriter(), this.id.getDistributedMember(), this.securityService); } public void sendCredentialsForWan(OutputStream out, InputStream in) { @@ -1734,10 +1734,10 @@ public class HandShake implements ClientHandShake { return; } String authenticator = this.system.getProperties().getProperty(SECURITY_CLIENT_AUTHENTICATOR); - Properties peerWanProps = readCredentials(dis, dos, this.system); + Properties peerWanProps = readCredentials(dis, dos, this.system, this.securityService); verifyCredentials(authenticator, peerWanProps, this.system.getSecurityProperties(), (InternalLogWriter) this.system.getLogWriter(), - (InternalLogWriter) this.system.getSecurityLogWriter(), member); + (InternalLogWriter) this.system.getSecurityLogWriter(), member, this.securityService); } private static int getKeySize(String skAlgo) { http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java index 1b08540..0275059 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java @@ -1032,7 +1032,7 @@ public class ServerConnection implements Runnable { Object principal = HandShake.verifyCredentials(methodName, credentials, system.getSecurityProperties(), (InternalLogWriter) system.getLogWriter(), - (InternalLogWriter) system.getSecurityLogWriter(), this.proxyId.getDistributedMember()); + (InternalLogWriter) system.getSecurityLogWriter(), this.proxyId.getDistributedMember(), this.securityService); if (principal instanceof Subject) { Subject subject = (Subject) principal; uniqueId = this.clientUserAuths.putSubject(subject); http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/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 b4f7282..1b1a222 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 @@ -116,7 +116,7 @@ public class ClearRegion extends BaseCommand { try { // Clear the region - this.securityService.authorizeRegionWrite(regionName); + securityService.authorizeRegionWrite(regionName); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) { http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/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 967caec..cab74e3 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 @@ -116,7 +116,7 @@ public class ContainsKey extends BaseCommand { } try { - this.securityService.authorizeRegionRead(regionName, key.toString()); + 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/7f1bd1e0/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 e73fb5a..c56890e 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,9 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -/** - * - */ package org.apache.geode.internal.cache.tier.sockets.command; import java.io.IOException; @@ -121,7 +118,7 @@ public class ContainsKey66 extends BaseCommand { } try { - this.securityService.authorizeRegionRead(regionName, key.toString()); + 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/7f1bd1e0/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 de4f8e2..13ad9de 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,9 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -/** - * - */ package org.apache.geode.internal.cache.tier.sockets.command; import java.io.IOException; @@ -101,7 +98,7 @@ public class CreateRegion extends BaseCommand { } try { - this.securityService.authorizeDataManage(); + securityService.authorizeDataManage(); } catch (NotAuthorizedException ex) { writeException(clientMessage, ex, false, serverConnection); serverConnection.setAsTrue(RESPONDED); http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/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 bd3b427..1d3fa25 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 @@ -136,7 +136,7 @@ public class Destroy extends BaseCommand { try { // for integrated security - this.securityService.authorizeRegionWrite(regionName, key.toString()); + securityService.authorizeRegionWrite(regionName, key.toString()); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) { http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/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 ddb6e0f..12ce768 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 @@ -108,7 +108,7 @@ public class Destroy65 extends BaseCommand { String regionName = null; Object callbackArg = null, key = null; - StringBuffer errMessage = new StringBuffer(); + StringBuilder errMessage = new StringBuilder(); CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); CacheServerStats stats = serverConnection.getCacheServerStats(); serverConnection.setAsTrue(REQUIRES_RESPONSE); @@ -225,7 +225,7 @@ public class Destroy65 extends BaseCommand { try { // for integrated security - this.securityService.authorizeRegionWrite(regionName, key.toString()); + securityService.authorizeRegionWrite(regionName, key.toString()); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) { http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/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 0728e15..392c25b 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 @@ -50,7 +50,7 @@ public class DestroyRegion extends BaseCommand { String regionName = null; Object callbackArg = null; Part eventPart = null; - StringBuffer errMessage = new StringBuffer(); + StringBuilder errMessage = new StringBuilder(); CacheServerStats stats = serverConnection.getCacheServerStats(); serverConnection.setAsTrue(REQUIRES_RESPONSE); @@ -126,7 +126,7 @@ public class DestroyRegion extends BaseCommand { try { // user needs to have data:manage on all regions in order to destory a particular region - this.securityService.authorizeDataManage(); + securityService.authorizeDataManage(); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) { http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/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 9a8a43d..491bdeb 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 @@ -74,8 +74,8 @@ public class ExecuteFunction extends BaseCommand { try { hasResult = clientMessage.getPart(0).getSerializedForm()[0]; if (hasResult == 1) { - servConn.setAsTrue(REQUIRES_RESPONSE); - servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + serverConnection.setAsTrue(REQUIRES_RESPONSE); + serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } function = clientMessage.getPart(1).getStringOrObject(); args = clientMessage.getPart(2).getObject(); @@ -89,8 +89,8 @@ public class ExecuteFunction extends BaseCommand { LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, servConn); - servConn.setAsTrue(RESPONDED); + writeChunkedException(clientMessage, exception, serverConnection); + serverConnection.setAsTrue(RESPONDED); return; } } @@ -98,8 +98,8 @@ public class ExecuteFunction extends BaseCommand { final String message = LocalizedStrings.ExecuteFunction_THE_INPUT_FUNCTION_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString(); - logger.warn("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } @@ -111,8 +111,8 @@ public class ExecuteFunction extends BaseCommand { if (functionObject == null) { final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } } else { @@ -121,21 +121,21 @@ public class ExecuteFunction extends BaseCommand { FunctionStats stats = FunctionStats.getFunctionStats(functionObject.getId()); - this.securityService.authorizeDataWrite(); + securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = servConn.getAuthzRequest(); + AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); ExecuteFunctionOperationContext executeContext = null; if (authzRequest != null) { executeContext = authzRequest.executeFunctionAuthorize(functionObject.getId(), null, null, args, functionObject.optimizeForWrite()); } - ChunkedMessage m = servConn.getFunctionResponseMessage(); + ChunkedMessage m = serverConnection.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); ResultSender resultSender = new ServerToClientFunctionResultSender(m, - MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext); + MessageType.EXECUTE_FUNCTION_RESULT, serverConnection, functionObject, executeContext); - InternalDistributedMember localVM = (InternalDistributedMember) servConn.getCache() + InternalDistributedMember localVM = (InternalDistributedMember) serverConnection.getCache() .getDistributedSystem().getDistributedMember(); FunctionContext context = null; @@ -146,17 +146,17 @@ public class ExecuteFunction extends BaseCommand { } else { context = new FunctionContextImpl(functionObject.getId(), args, resultSender); } - HandShake handShake = (HandShake) servConn.getHandshake(); + HandShake handShake = (HandShake) serverConnection.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: " + servConn.toString() + "with context :" + logger.debug("Executing Function on Server: " + serverConnection.toString() + "with context :" + context.toString()); } - InternalCache cache = servConn.getCache(); + InternalCache cache = serverConnection.getCache(); HeapMemoryMonitor hmm = ((InternalResourceManager) cache.getResourceManager()).getHeapMonitor(); if (functionObject.optimizeForWrite() && cache != null && hmm.getState().isCritical() @@ -184,7 +184,7 @@ public class ExecuteFunction extends BaseCommand { function), ioException); String message = LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString(); - sendException(hasResult, clientMessage, message, servConn, ioException); + sendException(hasResult, clientMessage, message, serverConnection, ioException); } catch (InternalFunctionInvocationTargetException internalfunctionException) { // Fix for #44709: User should not be aware of // InternalFunctionInvocationTargetException. No instance of @@ -202,29 +202,29 @@ public class ExecuteFunction extends BaseCommand { new Object[] {function}), internalfunctionException); } final String message = internalfunctionException.getMessage(); - sendException(hasResult, clientMessage, message, servConn, internalfunctionException); + sendException(hasResult, clientMessage, message, serverConnection, 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, servConn, e); + sendException(hasResult, clientMessage, message, serverConnection, e); } } - private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + private void sendException(byte hasResult, Message msg, String message, ServerConnection serverConnection, Throwable e) throws IOException { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e); - servConn.setAsTrue(RESPONDED); + writeFunctionResponseException(msg, MessageType.EXCEPTION, serverConnection, e); + serverConnection.setAsTrue(RESPONDED); } } - private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + private void sendError(byte hasResult, Message msg, String message, ServerConnection serverConnection) throws IOException { if (hasResult == 1) { - writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, servConn); - servConn.setAsTrue(RESPONDED); + writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, serverConnection); + serverConnection.setAsTrue(RESPONDED); } } http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/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 40b04c0..02b55bb 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 @@ -89,8 +89,8 @@ public class ExecuteFunction65 extends BaseCommand { hasResult = functionState; } if (hasResult == 1) { - servConn.setAsTrue(REQUIRES_RESPONSE); - servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + serverConnection.setAsTrue(REQUIRES_RESPONSE); + serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } function = clientMessage.getPart(1).getStringOrObject(); args = clientMessage.getPart(2).getObject(); @@ -104,8 +104,8 @@ public class ExecuteFunction65 extends BaseCommand { LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, servConn); - servConn.setAsTrue(RESPONDED); + writeChunkedException(clientMessage, exception, serverConnection); + serverConnection.setAsTrue(RESPONDED); return; } } @@ -113,8 +113,8 @@ public class ExecuteFunction65 extends BaseCommand { final String message = LocalizedStrings.ExecuteFunction_THE_INPUT_FUNCTION_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString(); - logger.warn("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } @@ -126,8 +126,8 @@ public class ExecuteFunction65 extends BaseCommand { if (functionObject == null) { final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } else { byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(), @@ -140,8 +140,8 @@ public class ExecuteFunction65 extends BaseCommand { String message = LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER .toLocalizedString(function); - logger.warn("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } } @@ -151,21 +151,21 @@ public class ExecuteFunction65 extends BaseCommand { FunctionStats stats = FunctionStats.getFunctionStats(functionObject.getId()); - this.securityService.authorizeDataWrite(); + securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = servConn.getAuthzRequest(); + AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); ExecuteFunctionOperationContext executeContext = null; if (authzRequest != null) { executeContext = authzRequest.executeFunctionAuthorize(functionObject.getId(), null, null, args, functionObject.optimizeForWrite()); } - ChunkedMessage m = servConn.getFunctionResponseMessage(); + ChunkedMessage m = serverConnection.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); ResultSender resultSender = new ServerToClientFunctionResultSender65(m, - MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext); + MessageType.EXECUTE_FUNCTION_RESULT, serverConnection, functionObject, executeContext); - InternalDistributedMember localVM = (InternalDistributedMember) servConn.getCache() + InternalDistributedMember localVM = (InternalDistributedMember) serverConnection.getCache() .getDistributedSystem().getDistributedMember(); FunctionContext context = null; @@ -175,16 +175,16 @@ public class ExecuteFunction65 extends BaseCommand { } else { context = new FunctionContextImpl(functionObject.getId(), args, resultSender, isReexecute); } - HandShake handShake = (HandShake) servConn.getHandshake(); + HandShake handShake = (HandShake) serverConnection.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: {}", servConn, context); + logger.debug("Executing Function on Server: {} with context: {}", serverConnection, context); } - InternalCache cache = servConn.getCache(); + InternalCache cache = serverConnection.getCache(); HeapMemoryMonitor hmm = ((InternalResourceManager) cache.getResourceManager()).getHeapMonitor(); if (functionObject.optimizeForWrite() && cache != null && hmm.getState().isCritical() @@ -195,7 +195,7 @@ public class ExecuteFunction65 extends BaseCommand { .toLocalizedString(new Object[] {functionObject.getId(), sm}), sm); - sendException(hasResult, clientMessage, e.getMessage(), servConn, e); + sendException(hasResult, clientMessage, e.getMessage(), serverConnection, e); return; } functionObject.execute(context); @@ -222,7 +222,7 @@ public class ExecuteFunction65 extends BaseCommand { function), ioException); String message = LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString(); - sendException(hasResult, clientMessage, message, servConn, ioException); + sendException(hasResult, clientMessage, message, serverConnection, ioException); } catch (InternalFunctionInvocationTargetException internalfunctionException) { // Fix for #44709: User should not be aware of // InternalFunctionInvocationTargetException. No instance of @@ -238,29 +238,29 @@ public class ExecuteFunction65 extends BaseCommand { new Object[] {function}), internalfunctionException); } final String message = internalfunctionException.getMessage(); - sendException(hasResult, clientMessage, message, servConn, internalfunctionException); + sendException(hasResult, clientMessage, message, serverConnection, 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, servConn, e); + sendException(hasResult, clientMessage, message, serverConnection, e); } } - private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + private void sendException(byte hasResult, Message msg, String message, ServerConnection serverConnection, Throwable e) throws IOException { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e); - servConn.setAsTrue(RESPONDED); + writeFunctionResponseException(msg, MessageType.EXCEPTION, serverConnection, e); + serverConnection.setAsTrue(RESPONDED); } } - private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + private void sendError(byte hasResult, Message msg, String message, ServerConnection serverConnection) throws IOException { if (hasResult == 1) { - writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, servConn); - servConn.setAsTrue(RESPONDED); + writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, serverConnection); + serverConnection.setAsTrue(RESPONDED); } } http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/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 6d73498..6479cc3 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 @@ -104,7 +104,7 @@ public class ExecuteFunction66 extends BaseCommand { byte[] bytes = clientMessage.getPart(0).getSerializedForm(); functionState = bytes[0]; if (bytes.length >= 5 - && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) { + && serverConnection.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) { functionTimeout = Part.decodeInt(bytes, 1); } @@ -122,8 +122,8 @@ public class ExecuteFunction66 extends BaseCommand { hasResult = functionState; } if (hasResult == 1) { - servConn.setAsTrue(REQUIRES_RESPONSE); - servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + serverConnection.setAsTrue(REQUIRES_RESPONSE); + serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } function = clientMessage.getPart(1).getStringOrObject(); args = clientMessage.getPart(2).getObject(); @@ -141,11 +141,11 @@ public class ExecuteFunction66 extends BaseCommand { LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, servConn); + writeChunkedException(clientMessage, exception, serverConnection); } else { - writeException(clientMessage, exception, false, servConn); + writeException(clientMessage, exception, false, serverConnection); } - servConn.setAsTrue(RESPONDED); + serverConnection.setAsTrue(RESPONDED); return; } @@ -154,8 +154,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[] {servConn.getName(), message})); - sendError(hasResult, clientMessage, message, servConn); + new Object[] {serverConnection.getName(), message})); + sendError(hasResult, clientMessage, message, serverConnection); return; } @@ -167,8 +167,8 @@ public class ExecuteFunction66 extends BaseCommand { if (functionObject == null) { final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } else { byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(), @@ -181,8 +181,8 @@ public class ExecuteFunction66 extends BaseCommand { String message = LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER .toLocalizedString(function); - logger.warn("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } } @@ -192,21 +192,21 @@ public class ExecuteFunction66 extends BaseCommand { FunctionStats stats = FunctionStats.getFunctionStats(functionObject.getId()); - this.securityService.authorizeDataWrite(); + securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = servConn.getAuthzRequest(); + AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); ExecuteFunctionOperationContext executeContext = null; if (authzRequest != null) { executeContext = authzRequest.executeFunctionAuthorize(functionObject.getId(), null, null, args, functionObject.optimizeForWrite()); } - ChunkedMessage m = servConn.getFunctionResponseMessage(); + ChunkedMessage m = serverConnection.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); ServerToClientFunctionResultSender resultSender = new ServerToClientFunctionResultSender65(m, - MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext); + MessageType.EXECUTE_FUNCTION_RESULT, serverConnection, functionObject, executeContext); - InternalDistributedMember localVM = (InternalDistributedMember) servConn.getCache() + InternalDistributedMember localVM = (InternalDistributedMember) serverConnection.getCache() .getDistributedSystem().getDistributedMember(); FunctionContext context = null; @@ -216,14 +216,14 @@ public class ExecuteFunction66 extends BaseCommand { } else { context = new FunctionContextImpl(functionObject.getId(), args, resultSender, isReexecute); } - HandShake handShake = (HandShake) servConn.getHandshake(); + HandShake handShake = (HandShake) serverConnection.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(functionTimeout); try { if (logger.isDebugEnabled()) { - logger.debug("Executing Function on Server: {} with context: {}", servConn, context); + logger.debug("Executing Function on Server: {} with context: {}", serverConnection, context); } - InternalCache cache = servConn.getCache(); + InternalCache cache = serverConnection.getCache(); HeapMemoryMonitor hmm = ((InternalResourceManager) cache.getResourceManager()).getHeapMonitor(); if (functionObject.optimizeForWrite() && cache != null && hmm.getState().isCritical() @@ -234,10 +234,10 @@ public class ExecuteFunction66 extends BaseCommand { .toLocalizedString(new Object[] {functionObject.getId(), sm}), sm); - sendException(hasResult, clientMessage, e.getMessage(), servConn, e); + sendException(hasResult, clientMessage, e.getMessage(), serverConnection, e); return; } - /** + /* * if cache is null, then either cache has not yet been created on this node or it is a * shutdown scenario. */ @@ -254,7 +254,7 @@ public class ExecuteFunction66 extends BaseCommand { } if (!functionObject.hasResult()) { - writeReply(clientMessage, servConn); + writeReply(clientMessage, serverConnection); } } catch (FunctionException functionException) { stats.endFunctionExecutionWithException(functionObject.hasResult()); @@ -271,7 +271,7 @@ public class ExecuteFunction66 extends BaseCommand { function), ioException); String message = LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString(); - sendException(hasResult, clientMessage, message, servConn, ioException); + sendException(hasResult, clientMessage, message, serverConnection, ioException); } catch (InternalFunctionInvocationTargetException internalfunctionException) { // Fix for #44709: User should not be aware of // InternalFunctionInvocationTargetException. No instance of @@ -289,13 +289,13 @@ public class ExecuteFunction66 extends BaseCommand { new Object[] {function}), internalfunctionException); } final String message = internalfunctionException.getMessage(); - sendException(hasResult, clientMessage, message, servConn, internalfunctionException); + sendException(hasResult, clientMessage, message, serverConnection, 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, servConn, e); + sendException(hasResult, clientMessage, message, serverConnection, e); } } @@ -385,9 +385,9 @@ public class ExecuteFunction66 extends BaseCommand { }; if (dm == null) { - /** + /* * Executing the function in its own thread pool as FunctionExecution Thread pool of - * DisributionManager is not yet available. + * DistributionManager is not yet available. */ execService.execute(functionExecution); } else { @@ -398,24 +398,24 @@ public class ExecuteFunction66 extends BaseCommand { stats.endFunctionExecution(startExecution, fn.hasResult()); } - private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + private void sendException(byte hasResult, Message msg, String message, ServerConnection serverConnection, Throwable e) throws IOException { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e); + writeFunctionResponseException(msg, MessageType.EXCEPTION, serverConnection, e); } else { - writeException(msg, e, false, servConn); + writeException(msg, e, false, serverConnection); } - servConn.setAsTrue(RESPONDED); + serverConnection.setAsTrue(RESPONDED); } - private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + private void sendError(byte hasResult, Message msg, String message, ServerConnection serverConnection) throws IOException { if (hasResult == 1) { - writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, servConn); + writeFunctionResponseError(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, serverConnection); } else { - writeErrorResponse(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, servConn); + writeErrorResponse(msg, MessageType.EXECUTE_FUNCTION_ERROR, message, serverConnection); } - servConn.setAsTrue(RESPONDED); + serverConnection.setAsTrue(RESPONDED); } } http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/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 ab3c121..e4ccc3b 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 @@ -73,12 +73,12 @@ public class ExecuteRegionFunction extends BaseCommand { Set filter = null; byte hasResult = 0; int filterSize = 0, partNumber = 0; - CachedRegionHelper crHelper = servConn.getCachedRegionHelper(); + CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); try { hasResult = clientMessage.getPart(0).getSerializedForm()[0]; if (hasResult == 1) { - servConn.setAsTrue(REQUIRES_RESPONSE); - servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + serverConnection.setAsTrue(REQUIRES_RESPONSE); + serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } regionName = clientMessage.getPart(1).getString(); function = clientMessage.getPart(2).getStringOrObject(); @@ -104,8 +104,8 @@ public class ExecuteRegionFunction extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, servConn); - servConn.setAsTrue(RESPONDED); + writeChunkedException(clientMessage, exception, serverConnection); + serverConnection.setAsTrue(RESPONDED); return; } } @@ -121,8 +121,8 @@ public class ExecuteRegionFunction extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString("region"); } - logger.warn("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } @@ -131,12 +131,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("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } - HandShake handShake = (HandShake) servConn.getHandshake(); + HandShake handShake = (HandShake) serverConnection.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(0); ServerToClientFunctionResultSender resultSender = null; @@ -148,18 +148,18 @@ public class ExecuteRegionFunction extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } } else { functionObject = (Function) function; } - this.securityService.authorizeDataWrite(); + securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = servConn.getAuthzRequest(); + AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); final String functionName = functionObject.getId(); final String regionPath = region.getFullPath(); ExecuteFunctionOperationContext executeContext = null; @@ -170,10 +170,10 @@ public class ExecuteRegionFunction extends BaseCommand { // Construct execution AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region); - ChunkedMessage m = servConn.getFunctionResponseMessage(); + ChunkedMessage m = serverConnection.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); resultSender = new ServerToClientFunctionResultSender(m, - MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext); + MessageType.EXECUTE_REGION_FUNCTION_RESULT, serverConnection, functionObject, executeContext); if (execution instanceof PartitionedRegionFunctionExecutor) { execution = new PartitionedRegionFunctionExecutor((PartitionedRegion) region, filter, args, @@ -185,7 +185,7 @@ public class ExecuteRegionFunction extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug("Executing Function: {} on Server: {} with Execution: {}", - functionObject.getId(), servConn, execution); + functionObject.getId(), serverConnection, execution); } if (hasResult == 1) { if (function instanceof String) { @@ -206,7 +206,7 @@ public class ExecuteRegionFunction extends BaseCommand { function), ioe); final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY .toLocalizedString(); - sendException(hasResult, clientMessage, message, servConn, ioe); + sendException(hasResult, clientMessage, message, serverConnection, ioe); } catch (InternalFunctionInvocationTargetException internalfunctionException) { // Fix for #44709: User should not be aware of // InternalFunctionInvocationTargetException. No instance of @@ -224,42 +224,42 @@ public class ExecuteRegionFunction extends BaseCommand { new Object[] {function}), internalfunctionException); } final String message = internalfunctionException.getMessage(); - sendException(hasResult, clientMessage, message, servConn, internalfunctionException); + sendException(hasResult, clientMessage, message, serverConnection, 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, servConn, fe); + sendException(hasResult, clientMessage, message, serverConnection, fe); } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), e); String message = e.getMessage(); - sendException(hasResult, clientMessage, message, servConn, e); + sendException(hasResult, clientMessage, message, serverConnection, e); } finally { handShake.setClientReadTimeout(earlierClientReadTimeout); } } - private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + private void sendException(byte hasResult, Message msg, String message, ServerConnection serverConnection, Throwable e) throws IOException { synchronized (msg) { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e); - servConn.setAsTrue(RESPONDED); + writeFunctionResponseException(msg, MessageType.EXCEPTION, serverConnection, e); + serverConnection.setAsTrue(RESPONDED); } } } - private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + private void sendError(byte hasResult, Message msg, String message, ServerConnection serverConnection) throws IOException { synchronized (msg) { if (hasResult == 1) { writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, - servConn); - servConn.setAsTrue(RESPONDED); + serverConnection); + serverConnection.setAsTrue(RESPONDED); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/7f1bd1e0/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 a4e7741..5e5e9d3 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 @@ -75,12 +75,12 @@ public class ExecuteRegionFunction61 extends BaseCommand { int removedNodesSize = 0; Set removedNodesSet = null; int filterSize = 0, partNumber = 0; - CachedRegionHelper crHelper = servConn.getCachedRegionHelper(); + CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); try { hasResult = clientMessage.getPart(0).getSerializedForm()[0]; if (hasResult == 1) { - servConn.setAsTrue(REQUIRES_RESPONSE); - servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + serverConnection.setAsTrue(REQUIRES_RESPONSE); + serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } regionName = clientMessage.getPart(1).getString(); function = clientMessage.getPart(2).getStringOrObject(); @@ -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, servConn); - servConn.setAsTrue(RESPONDED); + writeChunkedException(clientMessage, exception, serverConnection); + serverConnection.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("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); 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("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } - HandShake handShake = (HandShake) servConn.getHandshake(); + HandShake handShake = (HandShake) serverConnection.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(0); ServerToClientFunctionResultSender resultSender = null; @@ -161,15 +161,15 @@ public class ExecuteRegionFunction61 extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", servConn.getName(), message); - sendError(hasResult, clientMessage, message, servConn); + logger.warn("{}: {}", serverConnection.getName(), message); + sendError(hasResult, clientMessage, message, serverConnection); return; } } else { functionObject = (Function) function; } // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = servConn.getAuthzRequest(); + AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); final String functionName = functionObject.getId(); final String regionPath = region.getFullPath(); ExecuteFunctionOperationContext executeContext = null; @@ -180,10 +180,10 @@ public class ExecuteRegionFunction61 extends BaseCommand { // Construct execution AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region); - ChunkedMessage m = servConn.getFunctionResponseMessage(); + ChunkedMessage m = serverConnection.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); resultSender = new ServerToClientFunctionResultSender(m, - MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext); + MessageType.EXECUTE_REGION_FUNCTION_RESULT, serverConnection, functionObject, executeContext); if (execution instanceof PartitionedRegionFunctionExecutor) { @@ -199,7 +199,7 @@ public class ExecuteRegionFunction61 extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug("Executing Function: {} on Server: {} with Execution: {}", - functionObject.getId(), servConn, execution); + functionObject.getId(), serverConnection, execution); } if (hasResult == 1) { if (function instanceof String) { @@ -221,7 +221,7 @@ public class ExecuteRegionFunction61 extends BaseCommand { final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY .toLocalizedString(); - sendException(hasResult, clientMessage, message, servConn, ioe); + sendException(hasResult, clientMessage, message, serverConnection, ioe); } catch (FunctionException fe) { String message = fe.getMessage(); @@ -256,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, servConn, fe); + sendException(hasResult, clientMessage, message, serverConnection, fe); } } catch (Exception e) { @@ -264,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, servConn, e); + sendException(hasResult, clientMessage, message, serverConnection, e); } finally { @@ -273,19 +273,19 @@ public class ExecuteRegionFunction61 extends BaseCommand { } } - private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + private void sendException(byte hasResult, Message msg, String message, ServerConnection serverConnection, Throwable e) throws IOException { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e); - servConn.setAsTrue(RESPONDED); + writeFunctionResponseException(msg, MessageType.EXCEPTION, serverConnection, e); + serverConnection.setAsTrue(RESPONDED); } } - private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + private void sendError(byte hasResult, Message msg, String message, ServerConnection serverConnection) throws IOException { if (hasResult == 1) { - writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, servConn); - servConn.setAsTrue(RESPONDED); + writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, serverConnection); + serverConnection.setAsTrue(RESPONDED); } } }