rpms/openoffice.org/devel openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch, NONE, 1.1 openoffice.org.spec, 1.1748, 1.1749

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch 
Log Message:
Resolves: rhbz#477880 add openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch

openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch:

--- NEW FILE openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch ---
Index: source/remote/urp/urp_environment.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/remote/urp/urp_environment.cxx,v
retrieving revision 1.21
diff -u -r1.21 urp_environment.cxx
--- openoffice.org.orig/bridges/source/remote/urp/urp_environment.cxx	11 Apr 2008 11:14:42 -0000	1.21
+++ openoffice.org/bridges/source/remote/urp/urp_environment.cxx	12 Jan 2009 08:56:26 -0000
@@ -182,6 +184,7 @@
 {
 	~StaticSingleton()
 		{
+			::osl::MutexGuard static_dtor_mutex( ::osl::Mutex::getGlobalMutex() );
 			g_bStaticDestructorsCalled = sal_True;
 		}
 };
@@ -269,8 +272,11 @@
   	}
 	// in case, that the static destructors already have been called, no
 	// tiding up is done.
+	ClearableMutexGuard static_dtor_test( ::osl::Mutex::getGlobalMutex() );
 	if( ! g_bStaticDestructorsCalled  && ! pContext->m_pBridgeImpl->m_bDisposed )
 	{
+		static_dtor_test.clear();
+
 		// TODO : not threadsafe
 		// synchronization with dispatch methods needed !
 
@@ -341,9 +347,12 @@
 		}
 		pImpl->m_pReader = 0;
 
-		// delete the stubs
-		releaseStubs( pEnvRemote );
-
+		::osl::MutexGuard static_dtor_mutex( ::osl::Mutex::getGlobalMutex() );
+		if (!g_bStaticDestructorsCalled)
+		{
+			// delete the stubs
+			releaseStubs( pEnvRemote );
+		}
 	}
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1748
retrieving revision 1.1749
diff -u -r1.1748 -r1.1749
--- openoffice.org.spec	9 Jan 2009 13:56:09 -0000	1.1748
+++ openoffice.org.spec	12 Jan 2009 09:02:58 -0000	1.1749
@@ -132,6 +132,7 @@
 Patch59: workspace.vcl98.patch
 Patch60: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
 Patch61: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch62: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1411,6 +1412,7 @@
 %patch59 -p1 -b .workspace.vcl98.patch
 %patch60 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
 %patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3820,9 +3822,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Jan 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-14.5
+* Mon Jan 12 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-14.5
 - rename openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch to 
   upstream workspace.sw31bf02.patch
+- Resolves: rhbz#477880 add openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 
 * Wed Jan 07 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-14.4
 - add hyphen-el, hyphen-es