geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hiteshkhame...@apache.org
Subject [06/50] [abbrv] incubator-geode git commit: GEODE-1755 Clean up TODOs in membership, communications and serialization components
Date Thu, 18 Aug 2016 19:27:24 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll.java
old mode 100755
new mode 100644
index 412b702..955677f
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll.java
@@ -73,23 +73,6 @@ public class PutAll extends BaseCommand {
     CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
     CacheServerStats stats = servConn.getCacheServerStats();
     boolean replyWithMetaData = false;
-    if (crHelper.emulateSlowServer() > 0) {
-      // this.logger.fine("SlowServer", new Exception());
-      boolean interrupted = Thread.interrupted();
-      try {
-        Thread.sleep(crHelper.emulateSlowServer());
-      }
-      catch (InterruptedException ugh) {
-        interrupted = true;
-        servConn.getCachedRegionHelper().getCache().getCancelCriterion()
-            .checkCancelInProgress(ugh);
-      }
-      finally {
-        if (interrupted) {
-          Thread.currentThread().interrupt();
-        }
-      }
-    }
     
     // requiresResponse = true;
     servConn.setAsTrue(REQUIRES_RESPONSE);
@@ -185,10 +168,6 @@ public class PutAll extends BaseCommand {
 
       AuthorizeRequest authzRequest = servConn.getAuthzRequest();
       if (authzRequest != null) {
-        // TODO SW: This is to handle DynamicRegionFactory create
-        // calls. Rework this when the semantics of DynamicRegionFactory
-        // are
-        // cleaned up.
         if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
           authzRequest.createRegionAuthorize(regionName);
         }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll70.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll70.java
old mode 100755
new mode 100644
index 73a82a6..4e6e167
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll70.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll70.java
@@ -80,24 +80,6 @@ public class PutAll70 extends BaseCommand {
     CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
     CacheServerStats stats = servConn.getCacheServerStats();
     
-    if (crHelper.emulateSlowServer() > 0) {
-      // this.logger.debug("SlowServer", new Exception());
-      boolean interrupted = Thread.interrupted();
-      try {
-        Thread.sleep(crHelper.emulateSlowServer());
-      }
-      catch (InterruptedException ugh) {
-        interrupted = true;
-        servConn.getCachedRegionHelper().getCache().getCancelCriterion()
-            .checkCancelInProgress(ugh);
-      }
-      finally {
-        if (interrupted) {
-          Thread.currentThread().interrupt();
-        }
-      }
-    }
-    
     // requiresResponse = true;
     servConn.setAsTrue(REQUIRES_RESPONSE);
     {
@@ -227,10 +209,6 @@ public class PutAll70 extends BaseCommand {
 
       AuthorizeRequest authzRequest = servConn.getAuthzRequest();
       if (authzRequest != null) {
-        // TODO SW: This is to handle DynamicRegionFactory create
-        // calls. Rework this when the semantics of DynamicRegionFactory
-        // are
-        // cleaned up.
         if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
           authzRequest.createRegionAuthorize(regionName);
         }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll80.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll80.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll80.java
index 81ea585..78f5612 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll80.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/PutAll80.java
@@ -91,24 +91,6 @@ public class PutAll80 extends BaseCommand {
     CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
     CacheServerStats stats = servConn.getCacheServerStats();
     
-    if (crHelper.emulateSlowServer() > 0) {
-      // this.logger.debug("SlowServer", new Exception());
-      boolean interrupted = Thread.interrupted();
-      try {
-        Thread.sleep(crHelper.emulateSlowServer());
-      }
-      catch (InterruptedException ugh) {
-        interrupted = true;
-        servConn.getCachedRegionHelper().getCache().getCancelCriterion()
-            .checkCancelInProgress(ugh);
-      }
-      finally {
-        if (interrupted) {
-          Thread.currentThread().interrupt();
-        }
-      }
-    }
-    
     // requiresResponse = true;
     servConn.setAsTrue(REQUIRES_RESPONSE);
     servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); // new in 8.0
@@ -267,10 +249,6 @@ public class PutAll80 extends BaseCommand {
 
       AuthorizeRequest authzRequest = servConn.getAuthzRequest();
       if (authzRequest != null) {
-        // TODO SW: This is to handle DynamicRegionFactory create
-        // calls. Rework this when the semantics of DynamicRegionFactory
-        // are
-        // cleaned up.
         if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
           authzRequest.createRegionAuthorize(regionName);
         }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest.java
index be81b3e..c54fdd1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest.java
@@ -155,9 +155,6 @@ public class RegisterInterest extends BaseCommand {
 
       AuthorizeRequest authzRequest = servConn.getAuthzRequest();
       if (authzRequest != null) {
-        // TODO SW: This is a workaround for DynamicRegionFactory
-        // registerInterest calls. Remove this when the semantics of
-        // DynamicRegionFactory are cleaned up.
         if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
           RegisterInterestOperationContext registerContext = authzRequest
               .registerInterestAuthorize(regionName, key, interestType,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest61.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest61.java
old mode 100755
new mode 100644
index 62c065f..4b2cc1f
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest61.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest61.java
@@ -195,9 +195,6 @@ public class RegisterInterest61 extends BaseCommand {
 
       AuthorizeRequest authzRequest = servConn.getAuthzRequest();
       if (authzRequest != null) {
-        // TODO SW: This is a workaround for DynamicRegionFactory
-        // registerInterest calls. Remove this when the semantics of
-        // DynamicRegionFactory are cleaned up.
         if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
           RegisterInterestOperationContext registerContext = authzRequest
               .registerInterestAuthorize(regionName, key, interestType,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList.java
index 5338a7a..88c7e57 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList.java
@@ -175,9 +175,6 @@ public class RegisterInterestList extends BaseCommand {
         this.securityService.authorizeRegionRead(regionName);
         AuthorizeRequest authzRequest = servConn.getAuthzRequest();
         if (authzRequest != null) {
-          // TODO SW: This is a workaround for DynamicRegionFactory
-          // registerInterest calls. Remove this when the semantics of
-          // DynamicRegionFactory are cleaned up.
           if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
             RegisterInterestOperationContext registerContext = authzRequest
                 .registerInterestListAuthorize(regionName, keys, policy);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList61.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList61.java
old mode 100755
new mode 100644
index 8130fc7..f777c6d
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList61.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList61.java
@@ -186,9 +186,6 @@ public class RegisterInterestList61 extends BaseCommand {
       this.securityService.authorizeRegionRead(regionName);
       AuthorizeRequest authzRequest = servConn.getAuthzRequest();
       if (authzRequest != null) {
-        // TODO SW: This is a workaround for DynamicRegionFactory
-        // registerInterest calls. Remove this when the semantics of
-        // DynamicRegionFactory are cleaned up.
         if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
           RegisterInterestOperationContext registerContext = authzRequest
               .registerInterestListAuthorize(regionName, keys, policy);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList66.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList66.java
index 03469bd..fb84540 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList66.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList66.java
@@ -187,9 +187,6 @@ public class RegisterInterestList66 extends BaseCommand {
         this.securityService.authorizeRegionRead(regionName);
         AuthorizeRequest authzRequest = servConn.getAuthzRequest();
         if (authzRequest != null) {
-          // TODO SW: This is a workaround for DynamicRegionFactory
-          // registerInterest calls. Remove this when the semantics of
-          // DynamicRegionFactory are cleaned up.
           if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
             RegisterInterestOperationContext registerContext = authzRequest
                 .registerInterestListAuthorize(regionName, keys, policy);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RemoveAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RemoveAll.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RemoveAll.java
index a09a3d3..474d942 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RemoveAll.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RemoveAll.java
@@ -78,24 +78,6 @@ public class RemoveAll extends BaseCommand {
     CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
     CacheServerStats stats = servConn.getCacheServerStats();
     
-    if (crHelper.emulateSlowServer() > 0) {
-      // this.logger.fine("SlowServer", new Exception());
-      boolean interrupted = Thread.interrupted();
-      try {
-        Thread.sleep(crHelper.emulateSlowServer());
-      }
-      catch (InterruptedException ugh) {
-        interrupted = true;
-        servConn.getCachedRegionHelper().getCache().getCancelCriterion()
-            .checkCancelInProgress(ugh);
-      }
-      finally {
-        if (interrupted) {
-          Thread.currentThread().interrupt();
-        }
-      }
-    }
-    
     servConn.setAsTrue(REQUIRES_RESPONSE);
     servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
     {
@@ -213,10 +195,6 @@ public class RemoveAll extends BaseCommand {
 
       AuthorizeRequest authzRequest = servConn.getAuthzRequest();
       if (authzRequest != null) {
-        // TODO SW: This is to handle DynamicRegionFactory create
-        // calls. Rework this when the semantics of DynamicRegionFactory
-        // are
-        // cleaned up.
         if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
           authzRequest.createRegionAuthorize(regionName);
         }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Request.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Request.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Request.java
old mode 100755
new mode 100644
index 791329d..c84e189
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Request.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Request.java
@@ -63,24 +63,7 @@ public class Request extends BaseCommand {
     CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
     CacheServerStats stats = servConn.getCacheServerStats();
     StringId errMessage = null;
-    if (crHelper.emulateSlowServer() > 0) {
-      // this.logger.debug("SlowServer", new Exception());
-      boolean interrupted = Thread.interrupted();
-      try {
-        Thread.sleep(crHelper.emulateSlowServer());
-      }
-      catch (InterruptedException ugh) {
-        interrupted = true;
-        servConn.getCachedRegionHelper().getCache().getCancelCriterion()
-            .checkCancelInProgress(ugh);
-      }
-      finally {
-        if (interrupted) {
-          Thread.currentThread().interrupt();
-        }
-      }
-      ;
-    }
+
     servConn.setAsTrue(REQUIRES_RESPONSE);
     // requiresResponse = true;
     {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RequestEventValue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RequestEventValue.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RequestEventValue.java
old mode 100755
new mode 100644
index 5eabef0..5357c9f
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RequestEventValue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RequestEventValue.java
@@ -62,23 +62,6 @@ public class RequestEventValue extends BaseCommand {
     CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
     StringBuffer errMessage = new StringBuffer();
 
-    // TODO: Amogh- Do we need to keep this?
-    if (crHelper.emulateSlowServer() > 0) {
-      boolean interrupted = Thread.interrupted();
-      try {
-        Thread.sleep(crHelper.emulateSlowServer());
-      }
-      catch (InterruptedException ugh) {
-        interrupted = true;
-        ((GemFireCacheImpl)(servConn.getCachedRegionHelper().getCache()))
-            .getCancelCriterion().checkCancelInProgress(ugh);
-      }
-      finally {
-        if (interrupted) {
-          Thread.currentThread().interrupt();
-        }
-      }
-    }
     servConn.setAsTrue(REQUIRES_RESPONSE);
 
     // Retrieve the data from the message parts

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Size.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Size.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Size.java
index eefdd42..dc08fe5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Size.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Size.java
@@ -91,27 +91,6 @@ public class Size extends BaseCommand {
     // Size the entry
     try {
       this.securityService.authorizeRegionRead(regionName);
-          /*
-           *
-           * txtodo: doesn't seem like there is any notion of authzSize
-           *
-          AuthorizeRequest authzRequest = servConn.getAuthzRequest();
-          if (authzRequest != null) {
-            // TODO SW: This is to handle DynamicRegionFactory destroy
-            // calls. Rework this when the semantics of DynamicRegionFactory are
-            // cleaned up.
-            if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
-              RegionSizeOperationContext destroyContext = authzRequest
-                  .invalidateRegionAuthorize((String)key, callbackArg);
-              callbackArg = destroyContext.getCallbackArg();
-            }
-            else {
-              SizeOperationContext destroyContext = authzRequest
-                  .destroyAuthorize(regionName, key, callbackArg);
-              callbackArg = destroyContext.getCallbackArg();
-            }
-          }
-          */
       writeSizeResponse(region.size(), msg, servConn);
     } catch (RegionDestroyedException rde) {
       writeException(msg, rde, false, servConn);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/UnregisterInterest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/UnregisterInterest.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/UnregisterInterest.java
index 71f7665..97f0727 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/UnregisterInterest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/UnregisterInterest.java
@@ -114,9 +114,6 @@ public class UnregisterInterest extends BaseCommand {
 
     AuthorizeRequest authzRequest = servConn.getAuthzRequest();
     if (authzRequest != null) {
-      // TODO SW: This is a workaround for DynamicRegionFactory
-      // registerInterest calls. Remove this when the semantics of
-      // DynamicRegionFactory are cleaned up.
       if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
         try {
           UnregisterInterestOperationContext unregisterContext = authzRequest.unregisterInterestAuthorize(regionName,
key, interestType);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/UnregisterInterestList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/UnregisterInterestList.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/UnregisterInterestList.java
index 3c21408..c892575 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/UnregisterInterestList.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/UnregisterInterestList.java
@@ -128,9 +128,6 @@ public class UnregisterInterestList extends BaseCommand {
 
     AuthorizeRequest authzRequest = servConn.getAuthzRequest();
     if (authzRequest != null) {
-      // TODO SW: This is a workaround for DynamicRegionFactory
-      // registerInterest calls. Remove this when the semantics of
-      // DynamicRegionFactory are cleaned up.
       if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
         try {
           UnregisterInterestOperationContext unregisterContext = authzRequest.unregisterInterestListAuthorize(regionName,
keys);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
index b5f9d79..a69f878 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
@@ -3400,7 +3400,6 @@ public class Connection implements Runnable {
         msg = (ReplyMessage) msgReader.readMessage(header);
         len = header.getNioMessageLength();
       } else {
-        //TODO - really no need to go to shared map here, we could probably just cache an
idle one.
         MsgDestreamer destreamer = obtainMsgDestreamer(
             header.getNioMessageId(), version);
         while (header.getNioMessageType() == CHUNKED_MSG_TYPE) {
@@ -3955,7 +3954,6 @@ public class Connection implements Runnable {
       msg.setDoDecMessagesBeingReceived(true);
       if(directAck) {
         Assert.assertTrue(!isSharedResource(), "We were asked to send a direct reply on a
shared socket");
-        //TODO dirack we should resize the send buffer if we know this socket is used for
direct ack.
         msg.setReplySender(new DirectReplySender(this));
       }
       this.owner.getConduit().messageReceived(this, msg, bytesRead);
@@ -4052,7 +4050,6 @@ public class Connection implements Runnable {
       // reader threads send replies and we always want to permit those without waiting
       return;
     }
-    // @todo darrel: add some stats
     boolean interrupted = false;
     try {
       for (;;) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
index 9f0b61b..3a5eb9f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
@@ -483,9 +483,6 @@ public class ConnectionTable  {
       result = handleNewPendingConnection(id, true /* fixes bug 43386 */, preserveOrder,
m, pc,
                                           startTime, ackTimeout, ackSATimeout);
       if (!preserveOrder && threadOwnsResources) {
-        // TODO we only schedule unordered shared cnxs for timeout
-        // if we own sockets. This seems wrong. We should
-        // be willing to time them out even if we don't own sockets.
         scheduleIdleTimeout(result);
       }
     } else {  // we have existing connection
@@ -1046,9 +1043,6 @@ public class ConnectionTable  {
     if (ct == null) {
       return;
     }
-    // ct.close(); // TODO implementing this is a quagmire, but not necessary,
-    //                since recusing from JGroups takes care of our obligations
-    //                to our peers.
     lastInstance.set(null);
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgDestreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgDestreamer.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgDestreamer.java
index c3d29dd..f5041a8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgDestreamer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgDestreamer.java
@@ -71,7 +71,7 @@ public class MsgDestreamer {
 
   public MsgDestreamer(DMStats stats, CancelCriterion stopper, Version v) {
     this.stopper = stopper;
-    this.t = new DestreamerThread(stats, stopper); // @todo darrel: add group support
+    this.t = new DestreamerThread(stats, stopper);
     this.version = v;
     init();
   }
@@ -271,9 +271,6 @@ public class MsgDestreamer {
     }
     public void close() {
       this.closed = true;
-      // TODO nothing in the run method DIRECTLY throws an interrupt,
-      // though it's possible underlying methods might catch and suitable
-      // exit early...
       interrupt();
     }
     public boolean isClosed() {
@@ -434,7 +431,6 @@ public class MsgDestreamer {
       do {
         // only the thread that sets data to null ever does this check
         // so I believe it is ok to do this check outside of sync.
-        // @todo darrel: mitch questions this logic
         myData = this.data;
         if (myData == null) {
           for (;;) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
index f9d747b..a38244c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
@@ -1166,7 +1166,7 @@ public class TCPConduit implements Runnable {
    * Returns true if member is part of view, false if membership is not confirmed before
timeout.
    */
   public boolean waitForMembershipCheck(InternalDistributedMember remoteId) {
-    return membershipManager.waitForMembershipCheck(remoteId);
+    return membershipManager.waitForNewMember(remoteId);
   }
   
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/ClientTypeRegistration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/ClientTypeRegistration.java
b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/ClientTypeRegistration.java
index 4b4830e..f914c4e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/ClientTypeRegistration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/ClientTypeRegistration.java
@@ -126,9 +126,8 @@ public class ClientTypeRegistration implements TypeRegistration {
       throw lastException;
     } else {
       if(pools.isEmpty()) {
-        // TODO check for cache closed
         if (this.cache.isClosed()) {
-          throw new CacheClosedException("PDX detected cache was closed");
+          throw this.cache.getCacheClosedException("PDX detected cache was closed", null);
         }
         throw new CacheClosedException("Client pools have been closed so the PDX type registry
can not lookup a type.");
       } else {
@@ -272,9 +271,8 @@ public class ClientTypeRegistration implements TypeRegistration {
       throw lastException;
     } else {
       if(pools.isEmpty()) {
-        // TODO check for cache closed
         if (this.cache.isClosed()) {
-          throw new CacheClosedException("PDX detected cache was closed");
+          throw this.cache.getCacheClosedException("PDX detected cache was closed", null);
         }
         throw new CacheClosedException("Client pools have been closed so the PDX type registry
can not lookup an enum.");
       } else {
@@ -354,8 +352,6 @@ public class ClientTypeRegistration implements TypeRegistration {
   }
   @Override
   public void testClearRegistry() {
-    // TODO Auto-generated method stub
-    
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/EnumId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/EnumId.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/EnumId.java
index 8997a3c..efc1122 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/EnumId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/EnumId.java
@@ -87,7 +87,6 @@ public class EnumId implements DataSerializableFixedID {
 
   @Override
   public Version[] getSerializationVersions() {
-    // TODO Auto-generated method stub
     return null;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/EnumInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/EnumInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/EnumInfo.java
index 1240ad1..e3fc4d7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/EnumInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/EnumInfo.java
@@ -319,7 +319,6 @@ public class EnumInfo implements DataSerializableFixedID {
 
   @Override
   public Version[] getSerializationVersions() {
-    // TODO Auto-generated method stub
     return null;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/LonerTypeRegistration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/LonerTypeRegistration.java
b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/LonerTypeRegistration.java
index f49f359..5e1361b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/LonerTypeRegistration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/LonerTypeRegistration.java
@@ -157,8 +157,6 @@ public class LonerTypeRegistration implements TypeRegistration {
 
   @Override
   public void testClearRegistry() {
-    // TODO Auto-generated method stub
-    
   }
   
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceFactoryImpl.java
b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceFactoryImpl.java
index c687feb..1d3dbee 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceFactoryImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceFactoryImpl.java
@@ -27,9 +27,7 @@ import com.gemstone.gemfire.pdx.PdxInstanceFactory;
 import com.gemstone.gemfire.pdx.PdxUnreadFields;
 
 /**
- * TODO
- *  without
- * defining a real class. These PdxInstances can never be deserialized
+ * PdxInstances created with this factory can never be deserialized
  * but you can access their fields just like any other pdx.
  * <p>The current implementation of this interface is meant for internal use only.
  * The way it defines a PdxType is expensive since it can never figure out it is

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxReaderImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxReaderImpl.java
b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxReaderImpl.java
index 0513d5e..4a92462 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxReaderImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxReaderImpl.java
@@ -701,13 +701,10 @@ public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable
{
     if (!gfc.getPdxIgnoreUnreadFields()) {
       PdxType localPdxType = tr.getExistingTypeForClass(pdxClass);
       if (localPdxType != null) {
-        if (getPdxType().getTypeId() != localPdxType.getTypeId()) {
-          if (getPdxType().hasExtraFields(localPdxType)) {
-            // TODO: we can calculate the extra fields here
-            needToTrackReads = true;
-          }
-        } else {
-          // TODO they are the same type id so create an optimized PdxReaderImpl
+        if (getPdxType().getTypeId() != localPdxType.getTypeId()
+            && getPdxType().hasExtraFields(localPdxType)) {
+          // we could calculate the extra fields here
+          needToTrackReads = true;
         }
       } else {
         // we don't know what our local type would be

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PeerTypeRegistration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PeerTypeRegistration.java
b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PeerTypeRegistration.java
index db55ee3..9fd3e17 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PeerTypeRegistration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PeerTypeRegistration.java
@@ -550,7 +550,6 @@ public class PeerTypeRegistration implements TypeRegistration {
           EnumId id = (EnumId)k;
           EnumInfo info = (EnumInfo)v;
           enumToId.put(info, id);
-          // TODO: do I need to keep track of multiple ids for the same enum?
           if (ei.equals(info)) {
             result = id;
           }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TypeRegistry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TypeRegistry.java
b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TypeRegistry.java
index 22b964f..6914a35 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TypeRegistry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TypeRegistry.java
@@ -201,11 +201,8 @@ public class TypeRegistry {
       if (logger.isInfoEnabled()) {
         logger.info("Defining: {}", newType.toFormattedString());
       }
-    } else {
-      //TODO - this might be overkill, but type definition should be rare enough.
-      if(!oldType.equals(newType)) {
-        Assert.fail("Old type does not equal new type for the same id. oldType=" + oldType
+ " new type=" + newType);
-      }
+    } else if ( !oldType.equals(newType) ) {
+      Assert.fail("Old type does not equal new type for the same id. oldType=" + oldType
+ " new type=" + newType);
     }
     
     return id;
@@ -220,11 +217,8 @@ public class TypeRegistry {
       if (logger.isInfoEnabled()) {
         logger.info("Adding, from remote WAN: {}", newType.toFormattedString());
       }
-    } else {
-    //TODO - this might be overkill, but type definition should be rare enough.
-      if(!oldType.equals(newType)) {
-        Assert.fail("Old type does not equal new type for the same id. oldType=" + oldType
+ " new type=" + newType);
-      }
+    } else if ( !oldType.equals(newType) ) {
+      Assert.fail("Old type does not equal new type for the same id. oldType=" + oldType
+ " new type=" + newType);
     }
   }
 
@@ -371,11 +365,8 @@ public class TypeRegistry {
       this.distributedTypeRegistry.addRemoteEnum(enumId, newInfo);
       this.idToEnum.put(enumId, newInfo);
       this.enumInfoToId.put(newInfo, enumId);
-    } else {
-    //TODO - this might be overkill, but enum definition should be rare enough.
-      if(!oldInfo.equals(newInfo)) {
-        Assert.fail("Old enum does not equal new enum for the same id. oldEnum=" + oldInfo
+ " new enum=" + newInfo);
-      }
+    } else if ( !oldInfo.equals(newInfo) ) {
+      Assert.fail("Old enum does not equal new enum for the same id. oldEnum=" + oldInfo
+ " new enum=" + newInfo);
     }
   }
 
@@ -389,11 +380,8 @@ public class TypeRegistry {
     if(oldInfo == null) {
       this.idToEnum.put(id, newInfo);
       this.enumInfoToId.put(newInfo, id);
-    } else {
-      //TODO - this might be overkill, but type definition should be rare enough.
-      if(!oldInfo.equals(newInfo)) {
-        Assert.fail("Old enum does not equal new enum for the same id. oldEnum=" + oldInfo
+ " newEnum=" + newInfo);
-      }
+    } else if ( !oldInfo.equals(newInfo) ) {
+      Assert.fail("Old enum does not equal new enum for the same id. oldEnum=" + oldInfo
+ " newEnum=" + newInfo);
     }
     return id;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/json/PdxToJSON.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/json/PdxToJSON.java
b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/json/PdxToJSON.java
old mode 100755
new mode 100644
index bab97a7..f059794
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/json/PdxToJSON.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/json/PdxToJSON.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.pdx.internal.EnumInfo;
 import com.gemstone.gemfire.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
 
 /*
- * This class converts PdxInstance into JSON document.
+ * This class converts a PdxInstance into a JSON document.
  */
 public class PdxToJSON 
 {
@@ -59,7 +59,6 @@ public class PdxToJSON
       jg.close();
       return new String(hdos.toByteArray());
     } catch (IOException e) {
-      // TODO Auto-generated catch block
       throw new RuntimeException(e.getMessage());
     }finally{
         hdos.close();
@@ -77,7 +76,6 @@ public class PdxToJSON
       jg.close();      
       return hdos.toByteArray();
     } catch (IOException e) {
-      // TODO Auto-generated catch block
       throw new RuntimeException(e.getMessage());
     }finally {
       hdos.close();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0eb44ee/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index faef65c..0c0cb1c 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -379,6 +379,17 @@ public class GatewaySenderEventRemoteDispatcher implements
       Connection con;
       try {
         if (this.sender.isParallel()) {
+          /*
+           * TODO - The use of acquireConnection should be removed
+           * from the gateway code. This method is fine for tests,
+           * but these connections should really be managed inside
+           * the pool code. If the gateway needs to persistent connection
+           * to a single server, which should create have the OpExecutor
+           * that holds a reference to the connection (similar to the way
+           * we do with thread local connections).
+           * Use {@link ExecutablePool#setupServerAffinity(boolean)} for
+           * gateway code
+           */
           con = this.sender.getProxy().acquireConnection();
           // For parallel sender, setting server location will not matter.
           // everytime it will ask for acquire connection whenever it needs it. I



Mime
View raw message