geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ash...@apache.org
Subject [6/9] incubator-geode git commit: Revert "GEM-111: Cannot use 8.0.0.9+ clients with 8.1+ servers Added support for version 8009"
Date Wed, 11 Nov 2015 21:22:14 GMT
Revert "GEM-111: Cannot use 8.0.0.9+ clients with 8.1+ servers Added support for version 8009"

This reverts commit e1eb74effef800fa67db1c4010ecd67f05ea3b6b.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7dc4b2d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7dc4b2d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7dc4b2d2

Branch: refs/heads/feature/GEODE-11
Commit: 7dc4b2d27e200e36bbbb535de8058d0afa919690
Parents: 7cbaadc
Author: Barry Oglesby <boglesby@pivotal.io>
Authored: Tue Nov 10 16:57:07 2015 -0800
Committer: Barry Oglesby <boglesby@pivotal.io>
Committed: Tue Nov 10 16:57:07 2015 -0800

----------------------------------------------------------------------
 .../src/main/java/com/gemstone/gemfire/internal/Version.java    | 5 -----
 .../gemfire/internal/cache/tier/sockets/CommandInitializer.java | 4 ----
 .../internal/cache/tier/sockets/command/ExecuteFunction66.java  | 2 +-
 .../cache/tier/sockets/command/ExecuteRegionFunction66.java     | 2 +-
 .../tier/sockets/command/ExecuteRegionFunctionSingleHop.java    | 2 +-
 5 files changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7dc4b2d2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/Version.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/Version.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/Version.java
index 8726ba8..936ae79 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/Version.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/Version.java
@@ -175,11 +175,6 @@ public final class Version implements Comparable<Version> {
   
   // 31-34 available for 8.0.x variants
   
-  private static final byte GFE_8009_ORDINAL = 31;
-
-  public static final Version GFE_8009 = new Version("GFE", "8.0.0.9", (byte)8,
-      (byte)0, (byte)0, (byte)9, GFE_8009_ORDINAL);
-
   private static final byte GFE_81_ORDINAL = 35;
 
   public static final Version GFE_81 = new Version("GFE", "8.1", (byte)8,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7dc4b2d2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CommandInitializer.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CommandInitializer.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CommandInitializer.java
index 26ed47b..7e49d7a 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CommandInitializer.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CommandInitializer.java
@@ -301,10 +301,6 @@ public class CommandInitializer {
     gfe80Commands.put(MessageType.PUTALL, PutAll80.getCommand());
     ALL_COMMANDS.put(Version.GFE_80, gfe80Commands);
 
-    Map<Integer, Command> gfe8009Commands = new HashMap<Integer, Command>();
-    gfe8009Commands.putAll(ALL_COMMANDS.get(Version.GFE_80));
-    ALL_COMMANDS.put(Version.GFE_8009, gfe8009Commands);
-
     {
       Map<Integer, Command> gfe81Commands = new HashMap<Integer, Command>();
       gfe81Commands.putAll(ALL_COMMANDS.get(Version.GFE_80));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7dc4b2d2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction66.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction66.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction66.java
index 9160c11..3baac92 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction66.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction66.java
@@ -108,7 +108,7 @@ public class ExecuteFunction66 extends BaseCommand {
     try {
       byte[] bytes = msg.getPart(0).getSerializedForm();
       functionState = bytes[0];
-      if (bytes.length >= 5 && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal())
{
+      if (bytes.length >= 5 && servConn.getClientVersion().ordinal() >= Version.GFE_81.ordinal())
{
         functionTimeout = Part.decodeInt(bytes, 1);
       }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7dc4b2d2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
index 6d9ca49..329332b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
@@ -90,7 +90,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
     try {
       byte[] bytes = msg.getPart(0).getSerializedForm();
       functionState = bytes[0];
-      if (bytes.length >= 5 && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal())
{
+      if (bytes.length >= 5 && servConn.getClientVersion().ordinal() >= Version.GFE_81.ordinal())
{
         functionTimeout = Part.decodeInt(bytes, 1);
       }
       if (functionState != 1) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7dc4b2d2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
index 15b01fc..1c18cb1 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
@@ -88,7 +88,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
     try {
       byte[] bytes = msg.getPart(0).getSerializedForm();
       functionState = bytes[0];
-      if (bytes.length >= 5 && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal())
{
+      if (bytes.length >= 5 && servConn.getClientVersion().ordinal() >= Version.GFE_81.ordinal())
{
         functionTimeout = Part.decodeInt(bytes, 1);
       }
       if(functionState != 1) {


Mime
View raw message