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 2014/08/07 17:10:55 UTC
[05/10] git commit: Fixed merge error in drpc.clj
Fixed merge error in drpc.clj
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/8973e30d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/8973e30d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/8973e30d
Branch: refs/heads/security
Commit: 8973e30d70aa615c13ee02f10e20c4690ec1e43e
Parents: 87fc554
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jul 9 17:49:59 2014 +0000
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Tue Jul 22 09:41:53 2014 -0700
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/drpc.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8973e30d/storm-core/src/clj/backtype/storm/daemon/drpc.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/drpc.clj b/storm-core/src/clj/backtype/storm/daemon/drpc.clj
index baba96b..1340e49 100644
--- a/storm-core/src/clj/backtype/storm/daemon/drpc.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/drpc.clj
@@ -208,10 +208,10 @@
;; invocations that will unblock those threads
handler-server (when (> drpc-port 0)
(ThriftServer. conf
- (DistributedRPC$Processor. service-handler)
+ (DistributedRPC$Processor. drpc-service-handler)
ThriftConnectionType/DRPC))
invoke-server (ThriftServer. conf
- (DistributedRPCInvocations$Processor. service-handler)
+ (DistributedRPCInvocations$Processor. drpc-service-handler)
ThriftConnectionType/DRPC_INVOCATIONS)
http-creds-handler (AuthUtils/GetDrpcHttpCredentialsPlugin conf)]
(.addShutdownHook (Runtime/getRuntime) (Thread. (fn []