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/07/10 22:58:57 UTC
git commit: Fixed merge error in drpc.clj
Repository: incubator-storm
Updated Branches:
refs/heads/security f4bc21d3e -> 642ed7431
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/642ed743
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/642ed743
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/642ed743
Branch: refs/heads/security
Commit: 642ed743140acf7f9eec56cd98c65ac8435dfe9d
Parents: f4bc21d
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jul 9 17:49:59 2014 +0000
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jul 9 17:49:59 2014 +0000
----------------------------------------------------------------------
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/642ed743/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 []