You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2010/02/27 01:38:16 UTC

svn commit: r916887 [4/4] - in /qpid/branches/qmf-devel0.7: ./ qpid/cpp/include/qmf/engine/ qpid/cpp/include/qpid/ qpid/cpp/include/qpid/sys/posix/ qpid/cpp/include/qpid/sys/windows/ qpid/cpp/rubygen/framing.0-10/ qpid/cpp/src/ qpid/cpp/src/qmf/engine/...

Modified: qpid/branches/qmf-devel0.7/qpid/python/qpid/messaging/endpoints.py
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7/qpid/python/qpid/messaging/endpoints.py?rev=916887&r1=916886&r2=916887&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7/qpid/python/qpid/messaging/endpoints.py (original)
+++ qpid/branches/qmf-devel0.7/qpid/python/qpid/messaging/endpoints.py Sat Feb 27 00:38:13 2010
@@ -94,6 +94,7 @@
     self.session_counter = 0
     self.sessions = {}
     self._connected = False
+    self._transport_connected = False
     self._lock = RLock()
     self._condition = Condition(self._lock)
     self._waiter = Waiter(self._condition)
@@ -157,7 +158,7 @@
     """
     self._connected = True
     self._wakeup()
-    self._ewait(lambda: self._driver._connected and not self._unlinked(),
+    self._ewait(lambda: self._transport_connected and not self._unlinked(),
                 exc=ConnectError)
 
   def _unlinked(self):
@@ -173,7 +174,7 @@
     """
     self._connected = False
     self._wakeup()
-    self._ewait(lambda: not self._driver._connected)
+    self._ewait(lambda: not self._transport_connected)
 
   @synchronized
   def connected(self):

Propchange: qpid/branches/qmf-devel0.7/qpid/ruby/ext/sasl/extconf.rb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 27 00:38:13 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:911618-912022
+/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:911618-916854



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org