return 0 instead of throwing getMoreWaitException

2011-07-14 15:44:34 -04:00
parent db06c7a6d3
commit f1cd4e99c2
3 changed files with 8 additions and 11 deletions
--- a/db/instance.cpp
+++ b/db/instance.cpp
@@ -526,7 +526,13 @@ namespace mongo {
                Client::Context ctx(ns);
                msgdata = processGetMore(ns, ntoreturn, cursorid, curop, pass, exhaust);
            }
-            catch ( GetMoreWaitException& ) {
+            catch ( AssertionException& e ) {
+                exhaust = false;
+                curop.debug().exceptionInfo = e.getInfo();
+                msgdata = emptyMoreResult(cursorid);
+                ok = false;
+            }
+            if (msgdata == 0) {
                exhaust = false;
                massert(13073, "shutting down", !inShutdown() );
                if( pass == 0 ) {
@@ -547,12 +553,6 @@ namespace mongo {
                    sleepmillis(2);
                continue;
            }
-            catch ( AssertionException& e ) {
-                exhaust = false;
-                curop.debug().exceptionInfo = e.getInfo();
-                msgdata = emptyMoreResult(cursorid);
-                ok = false;
-            }
            break;
        };