[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Michael Meeks]

 wsd/LOOLWSD.cpp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1fc176fb05dc6440e005d0e324970d0184162a20
Author: Michael Meeks <michael.me...@collabora.com>
Date:   Mon May 8 13:08:24 2017 +0100

    Restore some clean exists during requests - avoiding exceptions.
    
    Change-Id: I89bb82f85341fcd87daf34d19f30031d1c6d1366

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 3c0fd06e..a6771996 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1925,6 +1925,7 @@ private:
                 // TODO: We should differentiate between bad request and 
failed conversion.
                 throw BadRequestException("Failed to convert and send file.");
             }
+            return;
         }
         else if (tokens.count() >= 4 && tokens[3] == "insertfile")
         {
@@ -2031,6 +2032,7 @@ private:
                 LOG_ERR("Download file [" << filePath.toString() << "] not 
found.");
             }
             (void)responded;
+            return;
         }
 
         throw BadRequestException("Invalid or unknown request.");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits