svn commit: r1383035 - in /qpid/proton/trunk/proton-c/src: driver.c engine/engine.c

[rh...@apache.org]

Author: rhs
Date: Mon Sep 10 18:48:50 2012
New Revision: 1383035

URL: http://svn.apache.org/viewvc?rev=1383035&view=rev
Log:
fixed bug due to delayed sasl initialization; added back printing of errors which somehow got dropped

Modified:
    qpid/proton/trunk/proton-c/src/driver.c
    qpid/proton/trunk/proton-c/src/engine/engine.c

Modified: qpid/proton/trunk/proton-c/src/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/driver.c?rev=1383035&r1=1383034&r2=1383035&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/driver.c Mon Sep 10 18:48:50 2012
@@ -96,6 +96,7 @@ struct pn_connector_t {
   char output[IO_BUF_SIZE];
   pn_connection_t *connection;
   pn_transport_t *transport;
+  pn_sasl_t *sasl;
   bool input_done;
   bool output_done;
   pn_listener_t *listener;
@@ -356,6 +357,7 @@ pn_connector_t *pn_connector_fd(pn_drive
   c->output_size = 0;
   c->connection = NULL;
   c->transport = pn_transport();
+  c->sasl = pn_sasl(c->transport);
   c->input_done = false;
   c->output_done = false;
   c->context = context;
@@ -386,7 +388,7 @@ void pn_connector_trace(pn_connector_t *
 
 pn_sasl_t *pn_connector_sasl(pn_connector_t *ctor)
 {
-  return ctor ? pn_sasl(ctor->transport) : NULL;
+  return ctor ? ctor->sasl : NULL;
 }
 
 void pn_connector_set_connection(pn_connector_t *ctor, pn_connection_t *connection)

Modified: qpid/proton/trunk/proton-c/src/engine/engine.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine.c?rev=1383035&r1=1383034&r2=1383035&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Mon Sep 10 18:48:50 2012
@@ -1436,6 +1436,11 @@ ssize_t pn_input(pn_transport_t *transpo
     } else if (n == 0) {
       break;
     } else {
+      if (n != PN_EOS) {
+        pn_dispatcher_trace(transport->disp, 0, "ERROR[%i] %s\n",
+                            pn_error_code(transport->error),
+                            pn_error_text(transport->error));
+      }
       if (transport->disp->trace & (PN_TRACE_RAW | PN_TRACE_FRM))
         pn_dispatcher_trace(transport->disp, 0, "<- EOS\n");
       return n;



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