added check for target and source being None

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@824144 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 4 deletions

diff --git a/python/qpid/driver.py b/python/qpid/driver.py
index 7c293fe146..588b46064c 100644
--- a/python/qpid/driver.py
+++ b/python/qpid/driver.py
@@ -439,14 +439,19 @@ class Driver:
     if _snd is None and not snd.closing and not snd.closed:
       _snd = Attachment(snd)
 
+      if snd.target is None:
+        snd.error = ("target is None",)
+        snd.closed = True
+        return
+
       try:
         _snd.name, _snd.subject, _snd.options = address.parse(snd.target)
       except address.LexError, e:
-        snd.error = e
+        snd.error = (e,)
         snd.closed = True
         return
       except address.ParseError, e:
-        snd.error = e
+        snd.error = (e,)
         snd.closed = True
         return
 
@@ -502,14 +507,19 @@ class Driver:
       _rcv.canceled = False
       _rcv.draining = False
 
+      if rcv.source is None:
+        rcv.error = ("source is None",)
+        rcv.closed = True
+        return
+
       try:
         _rcv.name, _rcv.subject, _rcv.options = address.parse(rcv.source)
       except address.LexError, e:
-        rcv.error = e
+        rcv.error = (e,)
         rcv.closed = True
         return
       except address.ParseError, e:
-        rcv.error = e
+        rcv.error = (e,)
         rcv.closed = True
         return