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

INTEGRATION: CWS qadev29 (1.9.8); FILE MERGED

Browse source 
2007/03/05 08:22:47 lla 1.9.8.1: #144950# concurrency problem solution
This commit is contained in:
Ivo Hinkelmann 2007-06-04 12:30:37 +00:00
parent 0482da19b7
commit 28917dfcf4
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
qadevOOo/runner/convwatch/ReferenceBuilder.java
View file

@ -4,9 +4,9 @@
*
* $RCSfile: ReferenceBuilder.java,v $
*
* $Revision: 1.9 $
* $Revision: 1.10 $
*
* last change: $Author: vg $ $Date: 2006-11-21 14:10:38 $
* last change: $Author: ihi $ $Date: 2007-06-04 13:30:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -236,8 +236,13 @@ public class ReferenceBuilder extends EnhancedComplexTestCase
{
// start a fresh Office
OfficeProvider aProvider = null;
SimpleFileSemaphore aSemaphore = new SimpleFileSemaphore();
if (aGTA.shouldOfficeStart())
{
if (OSHelper.isWindows())
{
aSemaphore.P(aSemaphore.getSemaphoreFile());
}
aGTA.getPerformance().startTime(PerformanceContainer.OfficeStart);
aProvider = new OfficeProvider();
XMultiServiceFactory xMSF = (XMultiServiceFactory) aProvider.getManager(param);
@ -249,6 +254,14 @@ public class ReferenceBuilder extends EnhancedComplexTestCase
aGTA.getPerformance().setTime(PerformanceContainer.OfficeStart, nStartTime);
}
// Watcher Object is need in log object to give a simple way to say if a running office is alive.
// As long as a log comes, it pings the Watcher and says the office is alive, if not an
// internal counter increase and at a given point (300 seconds) the office is killed.
GlobalLogWriter.get().println("Set office watcher");
Object aWatcher = param.get("Watcher");
GlobalLogWriter.get().setWatcher(aWatcher);
// initializeWatcher(param);
try
{
log.println("Reference type is " + aGTA.getReferenceType());
@ -278,6 +291,13 @@ public class ReferenceBuilder extends EnhancedComplexTestCase
boolean bClosed = aProvider.closeExistingOffice(param, true);
// Hope I can check that the close of the office fails
assure("Office closed", bClosed, true);
if (OSHelper.isWindows())
{
aSemaphore.V(aSemaphore.getSemaphoreFile());
aSemaphore.sleep(6);
// wait some time maybe an other process will take the semaphore
// I know, this is absolutly dirty, but the whole convwatch is dirty and need a big cleanup.
}
}
}
else