Merge lp:~cyphermox/mtp/lp1383819 into lp:mtp

[Mathieu Trudel-Lapierre]

Better handle file deletion compounded with inotify events for the same delete operation.

Better handle file deletion compounded with inotify events for the same delete operation.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:53
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mathieu-tl/mtp/lp1383819/+merge/239108/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mtp-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/mtp-utopic-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mtp-ci/25/rebuild

review: Needs Fixing (continuous-integration)

[Manuel de la Peña (mandel)]

review: Approve

Unmerged revisions

53. By Mathieu Trudel-Lapierre on 2014-10-21

Better handle file deletion compounded with inotify events for the same
delete operation.

=== modified file 'server/UbuntuMtpDatabase.h'
--- server/UbuntuMtpDatabase.h	2014-09-08 19:27:06 +0000
+++ server/UbuntuMtpDatabase.h	2014-10-21 17:25:19 +0000
@@ -251,7 +251,8 @@
         {
             const char* cdata = processed + asio::buffer_cast<const char*>(buf.data());
             const inotify_event* ievent = reinterpret_cast<const inotify_event*>(cdata);
-            MtpObjectHandle parent;
+            MtpObjectHandle parent = MTP_PARENT_ROOT;
+            path p;
      
             processed += sizeof(inotify_event) + ievent->len;
      
@@ -262,7 +263,15 @@
                 }
             }
 
-            path p(db.at(parent).path + "/" + ievent->name);
+            try {
+                p = path(db.at(parent).path + "/" + ievent->name);
+            } catch (...) {
+                /* If we can't match to a parent here; there is nothing
+                 * more to be done; just ignore and skip to the next
+                 * block of inotify data.
+                 */
+                continue;
+            }
 
             if(ievent->len > 0 && ievent->mask & IN_MODIFY)
             {