Safety check that link is not NULL when processing pending delivery messages on session (AMQP 1.0)

Queue creation - don't update QMF until all validation done
(Re-push)

Author: pjfawcett

src/qpid/broker/Queue.cpp

@@ -214,6 +214,15 @@ Queue::Queue(const string& _name, const QueueSettings& _settings,
         split(traceExclude, settings.traceExcludes, ", ");
     }
     qpid::amqp_0_10::translate(settings.asMap(), encodableSettings);
+
+    if ( settings.isBrowseOnly ) {
+        QPID_LOG ( info, "Queue " << name << " is browse-only." );
+    }
+    if (settings.filter.size()) {
+        selector.reset(new Selector(settings.filter));
+        QPID_LOG (info, "Queue " << name << " using filter: " << settings.filter);
+    }
+
     if (parent != 0 && broker != 0) {
         ManagementAgent* agent = broker->getManagementAgent();
         if (agent != 0) {
@@ -227,13 +236,6 @@ Queue::Queue(const string& _name, const QueueSettings& _settings,
         }
     }
 
-    if ( settings.isBrowseOnly ) {
-        QPID_LOG ( info, "Queue " << name << " is browse-only." );
-    }
-    if (settings.filter.size()) {
-        selector.reset(new Selector(settings.filter));
-        QPID_LOG (info, "Queue " << name << " using filter: " << settings.filter);
-    }
 }
 
 Queue::~Queue()

src/qpid/broker/amqp/Session.cpp

@@ -753,7 +753,11 @@ bool Session::dispatch()
             completed.swap(copy);
         }
         for (std::deque<pn_delivery_t*>::iterator i = copy.begin(); i != copy.end(); ++i) {
-            accepted(*i, true);
+            if (pn_delivery_link(*i)) {
+                accepted(*i, true);
+            } else {
+                QPID_LOG(warning, "Delivery to 'accept' has null link " << *i);
+            }
         }
     }
     for (IncomingLinks::iterator i = incoming.begin(); i != incoming.end();) {