qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r1669610 - /qpid/dispatch/trunk/src/server.c
Date Fri, 27 Mar 2015 15:49:03 GMT
Author: aconway
Date: Fri Mar 27 15:49:03 2015
New Revision: 1669610

URL: http://svn.apache.org/r1669610
Log:
NO-JIRA: server.c skip SASL setup if connection is closed due to SSL failure.

Modified:
    qpid/dispatch/trunk/src/server.c

Modified: qpid/dispatch/trunk/src/server.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/server.c?rev=1669610&r1=1669609&r2=1669610&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/server.c (original)
+++ qpid/dispatch/trunk/src/server.c Fri Mar 27 15:49:03 2015
@@ -203,6 +203,7 @@ static void thread_process_listeners(qd_
         qdpn_connector_set_connection(cxtr, conn);
         pn_connection_set_context(conn, ctx);
         ctx->pn_conn = conn;
+        ctx->owner_thread = CONTEXT_NO_OWNER;
         qdpn_connector_set_context(cxtr, ctx);
 
         // qd_server->lock is already locked
@@ -229,6 +230,7 @@ static void thread_process_listeners(qd_
                 qd_log(qd_server->log_source, QD_LOG_ERROR, "%s on %s",
                        qd_error_message(), log_incoming(logbuf, sizeof(logbuf), cxtr));
                 qdpn_connector_close(cxtr);
+                continue;
             }
         }
 
@@ -240,8 +242,6 @@ static void thread_process_listeners(qd_
         pn_sasl_server(sasl);
         pn_sasl_allow_skip(sasl, config->allow_no_sasl);
         pn_sasl_done(sasl, PN_SASL_OK);  // TODO - This needs to go away
-
-        ctx->owner_thread = CONTEXT_NO_OWNER;
     }
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message