You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/04/22 22:44:03 UTC
[2/4] storm git commit: Addressed review comments
Addressed review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c7bee2b8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c7bee2b8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c7bee2b8
Branch: refs/heads/master
Commit: c7bee2b880db2df4c715ea926c0de14e4715026c
Parents: c7b364e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Apr 9 14:34:54 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Apr 9 14:34:54 2015 -0500
----------------------------------------------------------------------
conf/defaults.yaml | 2 +-
.../serialization/GzipBridgeThriftSerializationDelegate.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c7bee2b8/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 78e89bb..4f7376b 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -47,7 +47,7 @@ storm.auth.simple-white-list.users: []
storm.auth.simple-acl.users: []
storm.auth.simple-acl.users.commands: []
storm.auth.simple-acl.admins: []
-storm.meta.serialization.delegate: "backtype.storm.serialization.ThriftSerializationDelegate"
+storm.meta.serialization.delegate: "backtype.storm.serialization.GzipThriftSerializationDelegate"
### nimbus.* configs are for the master
nimbus.host: "localhost"
http://git-wip-us.apache.org/repos/asf/storm/blob/c7bee2b8/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java b/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
index bb3ad7e..e5e77c3 100644
--- a/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
+++ b/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
@@ -22,10 +22,9 @@ import java.util.zip.GZIPInputStream;
/**
* Always writes gzip out, but tests incoming to see if it's gzipped. If it is, deserializes with gzip. If not, uses
- * {@link backtype.storm.serialization.DefaultSerializationDelegate} to deserialize. Any logic needing to be enabled
+ * {@link backtype.storm.serialization.ThriftSerializationDelegate} to deserialize. Any logic needing to be enabled
* via {@link #prepare(java.util.Map)} is passed through to both delegates.
*/
-@Deprecated
public class GzipBridgeThriftSerializationDelegate implements SerializationDelegate {
private ThriftSerializationDelegate defaultDelegate = new ThriftSerializationDelegate();