diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-05-11 10:31:48 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-05-11 10:31:48 +0000 |
| commit | b8871d23ea14d72ba1a22376e7812ea5840d1084 (patch) | |
| tree | 6535145f520c8a787a11e8ea50a30b84ab5982f6 | |
| parent | 650a600e41ab405d8590db35ebbcfb6a537e4baf (diff) | |
INTEGRATION: CWS linuxppc02 (1.8.2); FILE MERGED
2005/05/03 20:10:00 ericb 1.8.2.1: i38974 correct path for javaldx on Linux PPC and IBM jre142
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 78b576af1185..cad6de95714d 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -2,9 +2,9 @@ * * $RCSfile: util.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2005-04-27 08:53:32 $ + * last change: $Author: rt $ $Date: 2005-05-11 11:31:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,7 +101,8 @@ char const *g_arJavaNames[] = { "jdk", "jre", "java", - "Home" + "Home", + "IBMJava2-ppc-142" }; /* These are directory names which could contain multiple java installations. */ @@ -127,6 +128,8 @@ char const *g_arSearchPaths[] = { "", "usr/", "usr/local/", + "usr/local/IBMJava2-ppc-142", + "usr/local/j2sdk1.3.1", "usr/lib/", "usr/bin/" #endif @@ -268,6 +271,8 @@ FileHandleReader::readLine(rtl::OString * pLine) m_nIndex = 0; m_nSize = static_cast< int >(nRead); break; + case osl_File_E_INTR: + continue; default: return RESULT_ERROR; |