You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/01/26 20:38:31 UTC
[08/38] incubator-geode git commit: moving to jgroups 3.6.7
moving to jgroups 3.6.7
jgroups 3.6.7 fixes a few bugs that we reported during
feature/GEODE-77 development.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f5114c02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f5114c02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f5114c02
Branch: refs/heads/wan_cq_donation
Commit: f5114c02a2e592c58c612b48624a779767608d0d
Parents: ba3c8c5
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Mon Jan 25 10:14:43 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Mon Jan 25 10:15:30 2016 -0800
----------------------------------------------------------------------
gemfire-core/build.gradle | 2 +-
.../membership/gms/messenger/Transport.java | 34 ++------------------
2 files changed, 3 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f5114c02/gemfire-core/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-core/build.gradle b/gemfire-core/build.gradle
index 041dc07..925a2b6 100755
--- a/gemfire-core/build.gradle
+++ b/gemfire-core/build.gradle
@@ -31,7 +31,7 @@ dependencies {
// Source Dependencies
// External
provided files("${System.getProperty('java.home')}/../lib/tools.jar")
- compile 'org.jgroups:jgroups:3.6.6.Final'
+ compile 'org.jgroups:jgroups:3.6.7.Final'
compile 'antlr:antlr:' + project.'antlr.version'
compile 'com.fasterxml.jackson.core:jackson-annotations:' + project.'jackson.version'
compile 'com.fasterxml.jackson.core:jackson-core:' + project.'jackson.version'
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f5114c02/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
index fbb4b28..dfc2d6d 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
@@ -43,36 +43,6 @@ public class Transport extends UDP {
/*
* (non-Javadoc)
- * Copied from JGroups 3.6.6 UDP and modified to suppress
- * stack traces when unable to set the ttl due to the TCP implementation
- * not supporting the setting, and to only set ttl when multicast is
- * going to be used.
- *
- * @see org.jgroups.protocols.UDP#setTimeToLive(int)
- */
- @Override
- protected void setTimeToLive(int ttl) {
- if (ip_mcast) {
- if(getImpl != null && setTimeToLive != null) {
- try {
- Object impl=getImpl.invoke(sock);
- setTimeToLive.invoke(impl, ttl);
- }
- catch(InvocationTargetException e) {
- log.info("Unable to set ip_ttl - TCP/IP implementation does not support this setting");
- }
- catch(Exception e) {
- log.error("failed setting ip_ttl", e);
- }
- } else {
- log.warn("ip_ttl %d could not be set in the datagram socket; ttl will default to 1 (getImpl=%s, " +
- "setTimeToLive=%s)", ttl, getImpl, setTimeToLive);
- }
- }
- }
-
- /*
- * (non-Javadoc)
* copied from JGroups to perform Geode-specific error handling when there
* is a network partition
* @see org.jgroups.protocols.TP#_send(org.jgroups.Message, org.jgroups.Address)
@@ -140,7 +110,7 @@ public class Transport extends UDP {
// overridden to implement AvailablePort response
@Override
- public void receive(Address sender, byte[] data, int offset, int length, boolean copy_buffer) {
+ public void receive(Address sender, byte[] data, int offset, int length) {
if(data == null) return;
// drop message from self; it has already been looped back up (https://issues.jboss.org/browse/JGRP-1765)
@@ -162,7 +132,7 @@ public class Transport extends UDP {
return;
}
- super.receive(sender, data, offset, length, copy_buffer);
+ super.receive(sender, data, offset, length);
}
}