GEODE-670: GatewaySenderEvents are now sized using Sizeable if appropriate
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5b6a2cdc Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5b6a2cdc Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5b6a2cdc Branch: refs/heads/feature/GEODE-949-2 Commit: 5b6a2cdc08f521625e0987267201893735877323 Parents: 155f87d Author: Barry Oglesby <[email protected]> Authored: Wed Mar 16 11:50:44 2016 -0700 Committer: Barry Oglesby <[email protected]> Committed: Thu Mar 17 10:11:47 2016 -0700 ---------------------------------------------------------------------- .../java/com/gemstone/gemfire/internal/cache/BucketRegion.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5b6a2cdc/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java index 413fc87..2495464 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java @@ -2141,14 +2141,12 @@ implements Bucket } static int calcMemSize(Object value) { - if (value != null && (value instanceof GatewaySenderEventImpl)) { - return ((GatewaySenderEventImpl)value).getSerializedValueSize(); - } if (value == null || value instanceof Token) { return 0; } if (!(value instanceof byte[]) && !(value instanceof CachedDeserializable) - && !(value instanceof com.gemstone.gemfire.Delta) && !(value instanceof Delta)) { + && !(value instanceof com.gemstone.gemfire.Delta) && !(value instanceof Delta) + && !(value instanceof GatewaySenderEventImpl)) { // ezoerner:20090401 it's possible this value is a Delta throw new InternalGemFireError("DEBUG: calcMemSize: weird value (class " + value.getClass() + "): " + value);
