geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject incubator-geode git commit: GEODE-1927 backward compatibility support
Date Wed, 05 Oct 2016 17:59:28 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop c454d3ab7 -> 0a51d86d5


GEODE-1927 backward compatibility support

This fixes a problem in BaseCommand encountered during integration
testing.  The integration tests aren't checked in yet due to some
Gradle issues I need to work out dealing with downloading old
versions of GemFire to use in distributedTest runs.

I also removed a couple of testLoop() debugging methods from
distributed test classes.


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

Branch: refs/heads/develop
Commit: 0a51d86d594aa6365cc3e2e935db563b06ed4d75
Parents: c454d3a
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Wed Oct 5 10:58:13 2016 -0700
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Wed Oct 5 10:58:13 2016 -0700

----------------------------------------------------------------------
 .../geode/internal/cache/tier/sockets/BaseCommand.java       | 7 +++----
 .../java/org/apache/geode/distributed/LocatorDUnitTest.java  | 7 -------
 .../geode/distributed/LocatorUDPSecurityDUnitTest.java       | 8 --------
 3 files changed, 3 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a51d86d/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
index 743632c..213f7cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
@@ -19,8 +19,6 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
-import static com.sun.corba.se.impl.util.RepositoryId.cache;
-
 import org.apache.geode.*;
 import org.apache.geode.cache.*;
 import org.apache.geode.cache.persistence.PartitionOfflineException;
@@ -592,9 +590,10 @@ public abstract class BaseCommand implements Command {
   }
   
   private static Throwable getClientException(ServerConnection servConn, Throwable e) {
+    Cache cache = servConn.getCache();
     if (cache instanceof InternalCache) {
-      InternalCache cache = (InternalCache) servConn.getCache();
-      OldClientSupportService svc = cache.getService(OldClientSupportService.class);
+      InternalCache icache = (InternalCache) servConn.getCache();
+      OldClientSupportService svc = icache.getService(OldClientSupportService.class);
       if (svc != null) {
         return svc.getThrowable(e, servConn.getClientVersion());
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a51d86d/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
old mode 100755
new mode 100644
index b073d87..5ab45d6
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -1627,13 +1627,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     };
   }
 
-  public void testLoop() throws Exception {
-    for(int i=0; i < 200; i++) {
-      testMultipleLocatorsRestartingAtSameTime();
-      tearDown();
-      setUp();
-    }
-  }
   /**
    * Tests starting multiple locators at the same time and ensuring that the locators
    * end up only have 1 master.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a51d86d/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
old mode 100755
new mode 100644
index df5e0e0..bd37433
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
@@ -43,14 +43,6 @@ public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest{
   public LocatorUDPSecurityDUnitTest() {
   }
   
-  @Test
-  public void testLoop() throws Exception {
-    for(int i=0; i < 1; i++) {
-      testMultipleLocatorsRestartingAtSameTime();
-      tearDown();
-      setUp();
-    }
-  }
   
   @Override
   protected void addDSProps(Properties p) {


Mime
View raw message