strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1003002# java error handling: on linux reboot necessary after jvmsetup, interaction handler only gets XInteractionAbort

Browse source
This commit is contained in:
Joachim Lingner 2002-09-16 11:30:42 +00:00
parent 529868ac40
commit baf2cbd97e
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
stoc/source/javavm/interact.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: interact.cxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: jl $ $Date: 2002-07-23 14:07:16 $
* last change: $Author: jl $ $Date: 2002-09-16 12:30:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -60,6 +60,11 @@
************************************************************************/
#include "interact.hxx"
#ifndef _COM_SUN_STAR_JAVA_JAVADISABLEDEXCEPTION_HPP_
#include <com/sun/star/java/JavaDisabledException.hpp>
#endif
namespace stoc_javavm
{
@ -120,12 +125,32 @@ SAL_CALL InteractionRequest::getContinuations( ) throw (RuntimeException)
MutexGuard guard(javavm_getMutex());
if( ! m_pseqContinuations)
{
#ifdef LINUX
// Only if java is disabled we allow retry
if( m_anyRequest.getValueType() == getCppuType( (JavaDisabledException*)0))
{
Reference<XInteractionContinuation> arObjs[2];
arObjs[0]= Reference< XInteractionContinuation >(
static_cast<XWeak*> (new InteractionRetry(m_xJVM, m_pJVM)), UNO_QUERY);
arObjs[1]= Reference< XInteractionContinuation> (
static_cast<XWeak*> (new InteractionAbort(m_xJVM, m_pJVM)), UNO_QUERY);
m_seqContinuations= Sequence< Reference< XInteractionContinuation> >( arObjs, 2);
}
else
{
Reference<XInteractionContinuation> arObjs[1];
arObjs[0]= Reference< XInteractionContinuation> (
static_cast<XWeak*> (new InteractionAbort(m_xJVM, m_pJVM)), UNO_QUERY);
m_seqContinuations= Sequence< Reference< XInteractionContinuation> >( arObjs, 1);
}
#else
Reference<XInteractionContinuation> arObjs[2];
arObjs[0]= Reference< XInteractionContinuation >(
static_cast<XWeak*> (new InteractionRetry(m_xJVM, m_pJVM)), UNO_QUERY);
arObjs[1]= Reference< XInteractionContinuation> (
static_cast<XWeak*> (new InteractionAbort(m_xJVM, m_pJVM)), UNO_QUERY);
m_seqContinuations= Sequence< Reference< XInteractionContinuation> >( arObjs, 2);
#endif
}
}
return m_seqContinuations;