Changeset 15079 for trunk/Jav_Transform/src/com/scenari/s/co/transform/oo/impl/OoConnection.java

Timestamp:

03/08/10 21:24:12 (2 years ago)

Author:

sys

Message:

OO classLoader : crée un subClassLoader si utile pour Uno et/ou Scenair impl le nécessite.

File:

• trunk/Jav_Transform/src/com/scenari/s/co/transform/oo/impl/OoConnection.java (modified) (3 diffs)

trunk/Jav_Transform/src/com/scenari/s/co/transform/oo/impl/OoConnection.java

@@ -153 +153 @@
         /** Mémoire du fExternalUriReferenceTranslator. */
         protected XExternalUriReferenceTranslator fExternalUriReferenceTranslator;
-        
+
         /** Process en cours. */
         protected Process fOoProcess = null;
@@ -343 +343 @@
          */
         public void freedInPool() throws Exception {
-                if(fAutoLaunch && fHeadless && fOoProcess != null && fUsageCount >= 5) {
+                if (fAutoLaunch && fHeadless && fOoProcess != null && fUsageCount >= 5) {
                         fComponentContext = null;
                         fServiceMgr = null;
@@ -437 +437 @@
                         String vOfficeExePath = OoFinder.getPath() + "/" + (ISWIN ? "soffice.exe" : (ISMAC ? "soffice.bin" : "soffice"));
                         File vOfficeExe = new File(vOfficeExePath);
-                        if (vOfficeExe == null) throw new Exception("no OpenOffice executable found! (searching for '" + vOfficeExePath + "')");
+                        if (vOfficeExe == null || !vOfficeExe.canRead()) throw new Exception("no OpenOffice executable found! (searching for '" + vOfficeExePath + "')");
 
                         if (fMaxCnxAttempts <= 0) {