GEODE-94: Add typecast to prevent ambiguous method calls under JDK 8 Add typecast to Object for ambiguous logger arguments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d9936846 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d9936846 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d9936846 Branch: refs/heads/feature/GEODE-77 Commit: d993684693c2cf0da02f2282232aaf0d29bfbbdc Parents: 065072e Author: Kirk Lund <kl...@pivotal.io> Authored: Mon Jul 13 11:44:21 2015 -0700 Committer: Kirk Lund <kl...@pivotal.io> Committed: Tue Jul 14 08:42:33 2015 -0700 ---------------------------------------------------------------------- .../internal/membership/jgroup/JGroupMembershipManager.java | 2 +- .../src/main/java/com/gemstone/org/jgroups/protocols/FRAG2.java | 2 +- .../src/main/java/com/gemstone/org/jgroups/protocols/SMACK.java | 3 +-- .../main/java/com/gemstone/org/jgroups/protocols/UDP_NIO.java | 4 ++-- .../java/com/gemstone/org/jgroups/protocols/VIEW_ENFORCER.java | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d9936846/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java index 9c2d9fd..c589feb 100755 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java @@ -1066,7 +1066,7 @@ public class JGroupMembershipManager implements MembershipManager if ( (vmKind == DistributionManager.ADMIN_ONLY_DM_TYPE) && jgmsg.getIsDistributedCacheOperation()) { if (logger.isTraceEnabled(LogMarker.DM)) - logger.trace(LogMarker.DM, "Membership: admin VM discarding cache operation message {}", jgmsg.getObject()); + logger.trace(LogMarker.DM, "Membership: admin VM discarding cache operation message {}", (Object)jgmsg.getObject()); return; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d9936846/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/FRAG2.java ---------------------------------------------------------------------- diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/FRAG2.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/FRAG2.java index 0749859..0acd8f9 100644 --- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/FRAG2.java +++ b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/FRAG2.java @@ -234,7 +234,7 @@ public class FRAG2 extends Protocol { case Event.CONFIG: passUp(evt); - if(log.isInfoEnabled()) log.info(ExternalStrings.FRAG2_RECEIVED_CONFIG_EVENT__0, evt.getArg()); + if(log.isInfoEnabled()) log.info(ExternalStrings.FRAG2_RECEIVED_CONFIG_EVENT__0, (Object)evt.getArg()); handleConfigEvent((HashMap)evt.getArg()); return; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d9936846/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/SMACK.java ---------------------------------------------------------------------- diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/SMACK.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/SMACK.java index 95ca1f1..6ba4dfa 100644 --- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/SMACK.java +++ b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/SMACK.java @@ -160,8 +160,7 @@ public class SMACK extends Protocol implements AckMcastSenderWindow.RetransmitCo return; case Event.SUSPECT: - - if(log.isInfoEnabled()) log.info(ExternalStrings.SMACK_REMOVING_SUSPECTED_MEMBER__0, evt.getArg()); + if(log.isInfoEnabled()) log.info(ExternalStrings.SMACK_REMOVING_SUSPECTED_MEMBER__0, (Object)evt.getArg()); removeMember((Address)evt.getArg()); break; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d9936846/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/UDP_NIO.java ---------------------------------------------------------------------- diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/UDP_NIO.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/UDP_NIO.java index 573d461..bdcecba 100644 --- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/UDP_NIO.java +++ b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/UDP_NIO.java @@ -528,7 +528,7 @@ public class UDP_NIO extends Protocol implements Receiver { case Event.CONFIG: passUp(evt); - if(log.isInfoEnabled()) log.info(ExternalStrings.UDP_NIO_RECEIVED_CONFIG_EVENT__0, evt.getArg()); + if(log.isInfoEnabled()) log.info(ExternalStrings.UDP_NIO_RECEIVED_CONFIG_EVENT__0, (Object)evt.getArg()); handleConfigEvent((HashMap)evt.getArg()); return; } @@ -839,7 +839,7 @@ public class UDP_NIO extends Protocol implements Receiver { break; case Event.CONFIG: - if(log.isInfoEnabled()) log.info(ExternalStrings.UDP_NIO_RECEIVED_CONFIG_EVENT__0, evt.getArg()); + if(log.isInfoEnabled()) log.info(ExternalStrings.UDP_NIO_RECEIVED_CONFIG_EVENT__0, (Object)evt.getArg()); handleConfigEvent((HashMap)evt.getArg()); break; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d9936846/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/VIEW_ENFORCER.java ---------------------------------------------------------------------- diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/VIEW_ENFORCER.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/VIEW_ENFORCER.java index 426b8b4..9f2c220 100644 --- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/VIEW_ENFORCER.java +++ b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/VIEW_ENFORCER.java @@ -68,7 +68,7 @@ public class VIEW_ENFORCER extends Protocol { case Event.MSG: if(!is_member) { // drop message if we are not yet member of the group - if(log.isInfoEnabled()) log.info(ExternalStrings.VIEW_ENFORCER_DROPPING_MESSAGE__0, evt.getArg()); + if(log.isInfoEnabled()) log.info(ExternalStrings.VIEW_ENFORCER_DROPPING_MESSAGE__0, (Object)evt.getArg()); return; } break;
