You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/06/02 00:10:37 UTC
[50/50] [abbrv] incubator-geode git commit: remove
serializeCallbackArg from WrappedCallbackArgument since it was always true
remove serializeCallbackArg from WrappedCallbackArgument since it was always true
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2e11c08e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2e11c08e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2e11c08e
Branch: refs/heads/feature/GEODE-1464
Commit: 2e11c08e40c0985e572766521f97615b107e646b
Parents: 3c598e0
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Jun 1 17:07:31 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Jun 1 17:07:31 2016 -0700
----------------------------------------------------------------------
.../internal/cache/WrappedCallbackArgument.java | 26 +-------------------
.../cache/wan/AbstractGatewaySender.java | 2 +-
.../AbstractGatewaySenderEventProcessor.java | 2 +-
.../wan/GatewaySenderEventCallbackArgument.java | 8 ++----
4 files changed, 5 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2e11c08e/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
index 99a5ceb..44fd40d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
@@ -40,12 +40,6 @@ public abstract class WrappedCallbackArgument {
*/
private Object _originalCallbackArg;
- /** If the GatewayEvent is in a Sql Fabric started Hub, in which case
- * the original callback argument is not serialized
- *
- */
- private boolean serializeCallbackArg = true;
-
/**
* No arg constructor for DataSerializable.
*/
@@ -57,20 +51,6 @@ public abstract class WrappedCallbackArgument {
*
* @param originalCallbackArg The original callback argument set by the
* caller or null if there was not callback arg
- * @param serializeCBArg boolean indicating if the event is created by a
- * sql fabric system
- */
- public WrappedCallbackArgument(Object originalCallbackArg, boolean serializeCBArg) {
- this._originalCallbackArg = originalCallbackArg;
- this.serializeCallbackArg = serializeCBArg;
- }
-
-
- /**
- * Constructor.
- *
- * @param originalCallbackArg The original callback argument set by the
- * caller or null if there was not callback arg
*/
public WrappedCallbackArgument(Object originalCallbackArg) {
this._originalCallbackArg = originalCallbackArg;
@@ -86,11 +66,7 @@ public abstract class WrappedCallbackArgument {
}
public void toData(DataOutput out) throws IOException {
- if(this.serializeCallbackArg) {
- DataSerializer.writeObject(this._originalCallbackArg, out);
- }else {
- DataSerializer.writeObject(null, out);
- }
+ DataSerializer.writeObject(this._originalCallbackArg, out);
}
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2e11c08e/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
index 713023f..4db95d9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
@@ -908,7 +908,7 @@ public abstract class AbstractGatewaySender implements GatewaySender,
}
} else {
GatewaySenderEventCallbackArgument geCallbackArg = new GatewaySenderEventCallbackArgument(
- callbackArg, this.getMyDSId(), allRemoteDSIds, true);
+ callbackArg, this.getMyDSId(), allRemoteDSIds);
clonedEvent.setCallbackArgument(geCallbackArg);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2e11c08e/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 2ef5e19..6813850 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -829,7 +829,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
}
GatewaySenderEventCallbackArgument geCallbackArg = new GatewaySenderEventCallbackArgument(
event.getRawCallbackArgument(), this.sender.getMyDSId(),
- allRemoteDSIds, true);
+ allRemoteDSIds);
event.setCallbackArgument(geCallbackArg);
GatewaySenderEventImpl pdxSenderEvent = new GatewaySenderEventImpl(
EnumListenerEvent.AFTER_UPDATE, event, null); // OFFHEAP: event for pdx type meta data so it should never be off-heap
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2e11c08e/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
index f6f8d88..85a65e4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
@@ -96,14 +96,10 @@ WrappedCallbackArgument implements DataSerializableFixedID {
* @param originalReceivers
* The list of <code>Gateway</code> s to which the event has been
* originally sent
- * @param serializeCBArg
- * boolean indicating whether to serialize callback argument
- *
*/
public GatewaySenderEventCallbackArgument(Object originalCallbackArg,
- int originatingDSId, List<Integer> originalReceivers,
- boolean serializeCBArg) {
- super(originalCallbackArg, serializeCBArg);
+ int originatingDSId, List<Integer> originalReceivers) {
+ super(originalCallbackArg);
this.originatingDSId = originatingDSId;
initializeReceipientDSIds(originalReceivers);
}