diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-01 08:03:13 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-01 08:03:13 +0000 |
| commit | 430aa3404d674a98bfd0ec70884c576b178fc51c (patch) | |
| tree | c2e5f7d18e5fe0e42f2a942e1704cc6ec041b6cb | |
| parent | f99db492ff8ce6e36929922c3d8f7d68f2f243aa (diff) | |
INTEGRATION: CWS jl6 (1.6.18); FILE MERGED
2004/05/07 15:03:24 jl 1.6.18.1: #i20052#
| -rw-r--r-- | stoc/source/javavm/interact.cxx | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx index 54fee91415af..cd7244b8e0b1 100644 --- a/stoc/source/javavm/interact.cxx +++ b/stoc/source/javavm/interact.cxx @@ -2,9 +2,9 @@ * * $RCSfile: interact.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2004-02-02 19:27:15 $ + * last change: $Author: obo $ $Date: 2004-06-01 09:03:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -128,25 +128,10 @@ bool InteractionRequest::RetryContinuation::isSelected() const InteractionRequest::InteractionRequest(css::uno::Any const & rRequest): m_aRequest(rRequest) { - bool bRetry; -#if defined LINUX || defined FREEBSD || defined NETBSD - // Only if Java is disabled we allow retry: - bRetry = m_aRequest.isExtractableTo( - getCppuType(static_cast< css::java::JavaDisabledException * >(0))); -#else // LINUX - // If the creation of the JVM failed then do not offer retry, because Java - // might crash next time: - bRetry = !m_aRequest.isExtractableTo( - getCppuType( - static_cast< css::java::JavaVMCreationFailureException * >(0))); -#endif // LINUX - m_aContinuations.realloc(bRetry ? 2 : 1); + m_aContinuations.realloc(2); + m_xRetryContinuation = new RetryContinuation; m_aContinuations[0] = new AbortContinuation; - if (bRetry) - { - m_xRetryContinuation = new RetryContinuation; - m_aContinuations[1] = m_xRetryContinuation.get(); - } + m_aContinuations[1] = m_xRetryContinuation.get(); } css::uno::Any SAL_CALL InteractionRequest::getRequest() |