You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2015/09/04 23:13:23 UTC
[1/3] incubator-geode git commit: GEODE-77 a log statement was using
the wrong logger method, resulting in an odd log message containing {0}
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-77 cfbf5a404 -> 7956d0652
GEODE-77 a log statement was using the wrong logger method, resulting in an odd log message containing {0}
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c43d0457
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c43d0457
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c43d0457
Branch: refs/heads/feature/GEODE-77
Commit: c43d045788aa2a87f477b6f3c396ab76b8707ab6
Parents: cfbf5a4
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Sep 4 14:09:15 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Sep 4 14:09:15 2015 -0700
----------------------------------------------------------------------
.../cache/client/internal/pooling/ConnectionManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c43d0457/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
index 0f81eef..c500e30 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
@@ -801,7 +801,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
getPoolStats().incPrefillConnect();
}
catch (ServerConnectivityException ex) {
- logger.info(LocalizedMessage.create(LocalizedStrings.ConnectionManagerImpl_UNABLE_TO_PREFILL_POOL_TO_MINIMUM_BECAUSE_0, ex), null);
+ logger.info(LocalizedMessage.create(LocalizedStrings.ConnectionManagerImpl_UNABLE_TO_PREFILL_POOL_TO_MINIMUM_BECAUSE_0, (Object)ex));
return false;
}
finally {
[3/3] incubator-geode git commit: GEODE-77 added an additional
catch/retry of NoAvailableLocatorsException
Posted by bs...@apache.org.
GEODE-77 added an additional catch/retry of NoAvailableLocatorsException
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7956d065
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7956d065
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7956d065
Branch: refs/heads/feature/GEODE-77
Commit: 7956d06524fcba1f5dd329dd4ae13faa7b024d2a
Parents: e21dc11
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Sep 4 14:13:06 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Sep 4 14:13:06 2015 -0700
----------------------------------------------------------------------
.../cache/client/internal/AutoConnectionSourceDUnitTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7956d065/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
index 1fdb67c..d600472 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -384,8 +384,9 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
System.err.println("Attempt: " + (i++));
putInVM(vm, regionName, key, value);
break;
- } catch(dunit.RMIException e) {
- if(!(e.getCause() instanceof NoAvailableServersException)) {
+ } catch (NoAvailableServersException | dunit.RMIException e) {
+ if( !(e instanceof NoAvailableServersException)
+ && !(e.getCause() instanceof NoAvailableServersException)) {
throw e;
}
if(remaining <= 0) {
[2/3] incubator-geode git commit: GEODE-77 changed this test to use
annotations per Jason's recommendation
Posted by bs...@apache.org.
GEODE-77 changed this test to use annotations per Jason's recommendation
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e21dc11e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e21dc11e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e21dc11e
Branch: refs/heads/feature/GEODE-77
Commit: e21dc11e95b1d58c43cc7ad5463174ae4d730caa
Parents: c43d045
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Sep 4 14:09:47 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Sep 4 14:09:47 2015 -0700
----------------------------------------------------------------------
.../internal/tcpserver/TcpServerJUnitTest.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e21dc11e/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerJUnitTest.java
index f6c5b20..77bd004 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerJUnitTest.java
@@ -13,21 +13,22 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.Assert;
-import junit.framework.TestCase;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.DataSerializable;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.PoolStatHelper;
import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
-import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient;
-import com.gemstone.gemfire.distributed.internal.tcpserver.TcpHandler;
-import com.gemstone.gemfire.distributed.internal.tcpserver.TcpServer;
import com.gemstone.gemfire.internal.AvailablePort;
//import com.gemstone.org.jgroups.stack.GossipClient;
//import com.gemstone.org.jgroups.stack.IpAddress;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
-public class TcpServerJUnitTest extends TestCase {
+@Category(UnitTest.class)
+public class TcpServerJUnitTest {
protected/*GemStoneAddition*/ InetAddress localhost;
protected/*GemStoneAddition*/ int port;
@@ -43,7 +44,7 @@ public class TcpServerJUnitTest extends TestCase {
server.start();
}
-
+ @Test
public void test() throws UnknownHostException, IOException, ClassNotFoundException, InterruptedException {
EchoHandler handler = new EchoHandler();
start(handler);
@@ -71,6 +72,7 @@ public class TcpServerJUnitTest extends TestCase {
}
+ @Test
public void testConcurrency() throws UnknownHostException, IOException, ClassNotFoundException, InterruptedException {
CountDownLatch latch = new CountDownLatch(1);
DelayHandler handler = new DelayHandler(latch);