From 2b6e9bd89a5f93e4352ef1cd0801310d9558343f Mon Sep 17 00:00:00 2001
From: Cédric Bosdonnat <cedric.bosdonnat@free.fr>
Date: Mon, 2 Jul 2012 14:57:43 +0200
Subject: libcmis: fixed unexpected exception thrown

Change-Id: Iaa42756f596333747a9100e075a2638b839175b3
---
 libcmis/libcmis-0.2.3.patch | 34 ++++++++++++++++++++++++++++++++++
 libcmis/makefile.mk         |  3 +++
 2 files changed, 37 insertions(+)
 create mode 100644 libcmis/libcmis-0.2.3.patch

(limited to 'libcmis')

diff --git a/libcmis/libcmis-0.2.3.patch b/libcmis/libcmis-0.2.3.patch
new file mode 100644
index 000000000000..3b21e70db4af
--- /dev/null
+++ b/libcmis/libcmis-0.2.3.patch
@@ -0,0 +1,34 @@
+diff -ru libcmis-0.2.3/src/libcmis/atom-document.cxx misc/build/libcmis-0.2.3/src/libcmis/atom-document.cxx
+--- libcmis-0.2.3/src/libcmis/atom-document.cxx	2012-07-02 14:39:04.815222889 +0200
++++ misc/build/libcmis-0.2.3/src/libcmis/atom-document.cxx	2012-07-02 14:41:09.088229625 +0200
+@@ -129,15 +129,22 @@
+ vector< string > AtomDocument::getPaths( )
+ {
+     vector< string > paths;
+-    vector< libcmis::FolderPtr > parents = getParents( );
+-    for ( vector< libcmis::FolderPtr >::iterator it = parents.begin( );
+-         it != parents.end(); ++it )
++    try
+     {
+-        string path = ( *it )->getPath( );
+-        if ( path[path.size() - 1] != '/' )
+-            path += "/";
+-        path += getName( );
+-        paths.push_back( path );
++        vector< libcmis::FolderPtr > parents = getParents( );
++        for ( vector< libcmis::FolderPtr >::iterator it = parents.begin( );
++             it != parents.end(); ++it )
++        {
++            string path = ( *it )->getPath( );
++            if ( path[path.size() - 1] != '/' )
++                path += "/";
++            path += getName( );
++            paths.push_back( path );
++        }
++    }
++    catch ( const libcmis::Exception& )
++    {
++        // We may not have the permission to get the parents
+     }
+     return paths;
+ }
diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index 37e4f6b42fe0..cedddf93a62d 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -44,6 +44,9 @@ TARGET=cmis
 TARFILE_NAME=libcmis-0.2.3
 TARFILE_MD5=0d2dcdfbf28d6208751b33057f5361f0
 
+# Pushed upstream in both master and libcmis-0.2 branches
+PATCH_FILES+=libcmis-0.2.3.patch
+
 .IF "$(OS)$(COM)" == "WNTMSC"
 PATCH_FILES+=boost-win.patch
 .ENDIF
-- 
cgit