idok-commit AT lists.psi.ch

Subject: Commit emails of the iDok project

List archive

[idok-commit] idok commit r378 - in trunk/java/ch/idok/dmsd: impl/extractor/microsoft main

From: "AFS account Florian Huebner" <huebner AT savannah.psi.ch>
To: idok-commit AT lists.psi.ch
Subject: [idok-commit] idok commit r378 - in trunk/java/ch/idok/dmsd: impl/extractor/microsoft main
Date: Wed, 29 Jul 2009 11:48:11 +0200
List-archive: <https://lists.web.psi.ch/pipermail/idok-commit/>
List-id: Commit emails of the iDok project <idok-commit.lists.psi.ch>

Author: huebner
Date: Wed Jul 29 11:48:10 2009
New Revision: 378

Log:
More changes for 1.5 code compliance

Modified:

trunk/java/ch/idok/dmsd/impl/extractor/microsoft/MSOfficeExtractorFactory.java
trunk/java/ch/idok/dmsd/impl/extractor/microsoft/OOProcess.java
trunk/java/ch/idok/dmsd/main/Daemon.java

Modified:
trunk/java/ch/idok/dmsd/impl/extractor/microsoft/MSOfficeExtractorFactory.java
==============================================================================
---
trunk/java/ch/idok/dmsd/impl/extractor/microsoft/MSOfficeExtractorFactory.java
(original)
+++
trunk/java/ch/idok/dmsd/impl/extractor/microsoft/MSOfficeExtractorFactory.java
Wed Jul 29 11:48:10 2009
@@ -561,7 +561,6 @@
streamReaderTimeout =
getLong("ch.idok.dmsd.impl.extractor.microsoft.streamReaderTimeout",
streamReaderTimeout);
initOO();
Runtime.getRuntime().addShutdownHook(new Thread (new Runnable() {
- @Override
public void run() {
if (soffice != null)
soffice.destroy();

Modified: trunk/java/ch/idok/dmsd/impl/extractor/microsoft/OOProcess.java
==============================================================================
--- trunk/java/ch/idok/dmsd/impl/extractor/microsoft/OOProcess.java
(original)
+++ trunk/java/ch/idok/dmsd/impl/extractor/microsoft/OOProcess.java Wed
Jul 29 11:48:10 2009
@@ -216,7 +216,7 @@
private OOProcess() {
try {
executable =
System.getProperty("ch.idok.dmsd.impl.extractor.microsoft.soffice",
executable);
- if (! new File(executable).canExecute())
+ if (! new File(executable).canRead())
DmsException.throwIt(ErrorType.BAD_ARG, this, "Invalid
executable path",
"ch.idok.dmsd.impl.extractor.microsoft.soffice property
value is invalid");
tmpDir = getTmpDir();
@@ -246,7 +246,6 @@
procBuilder = procBuilder.redirectErrorStream(true);
procBuilder = procBuilder.directory(new File(tmpDir));
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
- @Override
public void run() {
stop();
}

Modified: trunk/java/ch/idok/dmsd/main/Daemon.java
==============================================================================
--- trunk/java/ch/idok/dmsd/main/Daemon.java (original)
+++ trunk/java/ch/idok/dmsd/main/Daemon.java Wed Jul 29 11:48:10 2009
@@ -137,7 +137,6 @@
config.getExternalDaemonControl(), args); // exits
config.initialize(args); // Construct pipeline
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
- @Override
public void run() {
config.destroy();
}

[idok-commit] idok commit r378 - in trunk/java/ch/idok/dmsd: impl/extractor/microsoft main, AFS account Florian Huebner, 07/29/2009