Github user d2r commented on a diff in the pull request:

    https://github.com/apache/storm/pull/838#discussion_r45514952
  
    --- Diff: 
storm-core/src/jvm/backtype/storm/messaging/netty/SaslStormServerHandler.java 
---
    @@ -136,17 +135,19 @@ public void messageReceived(ChannelHandlerContext 
ctx, MessageEvent e)
     
         @Override
         public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent 
e) {
    -        server.closeChannel(e.getChannel());
    +        if(server != null) server.closeChannel(e.getChannel());
         }
     
         private void getSASLCredentials() throws IOException {
    -        topologyName = (String) this.server.storm_conf
    -                .get(Config.TOPOLOGY_NAME);
    -        String secretKey = SaslUtils.getSecretKey(this.server.storm_conf);
    +        String secretKey;
    +        topologyName = server.name();
    +        secretKey = server.secretKey();
    +
             if (secretKey != null) {
                 token = secretKey.getBytes();
             }
    +
             LOG.debug("SASL credentials for storm topology " + topologyName
    -                + " is " + secretKey);
    +                  + " is " + secretKey);
    --- End diff --
    
    Let's use format strings in this log message so we don't construct strings 
every time.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to