[Libreoffice-commits] .: jvmfwk/plugins

[Caolán McNamara]

 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 11f7f9c22fba9551adcfce46657e02376962c7bd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 24 15:49:45 2011 +0100

    resolve symbolic links to jvm dirs for especially smoketest inside ooenv

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index f10472e..605dc27 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -834,7 +834,18 @@ OUString resolveDirPath(const OUString & path)
         FileStatus status(osl_FileStatus_Mask_Type |
                           osl_FileStatus_Mask_LinkTargetURL |
                           osl_FileStatus_Mask_FileURL);
-        
+
+        int nDepth = 0;
+        while (item.getFileStatus(status) == File::E_None &&
+               status.getFileType() == FileStatus::Link)
+        {
+            if (++nDepth == 128)
+                break;
+            sResolved = status.getLinkTargetURL();
+            if (DirectoryItem::get(sResolved, item) != File::E_None)
+                break;
+        }
+
         if (item.getFileStatus(status) == File::E_None
             && status.getFileType() == FileStatus::Directory)
         {