rpms/openoffice.org/devel openoffice.org-2.3.0.rh326161.jvmfwk.retryjvm.patch, NONE, 1.1 openoffice.org.spec, 1.1318, 1.1319

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4295

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.rh326161.jvmfwk.retryjvm.patch 
Log Message:
add openoffice.org-2.3.0.rh326161.jvmfwk.retryjvm.patch

openoffice.org-2.3.0.rh326161.jvmfwk.retryjvm.patch:

--- NEW FILE openoffice.org-2.3.0.rh326161.jvmfwk.retryjvm.patch ---
Index: source/javavm/javavm.cxx
===================================================================
RCS file: /cvs/udk/stoc/source/javavm/javavm.cxx,v
retrieving revision 1.72
diff -u -p -u -r1.72 javavm.cxx
--- openoffice.org.orig/stoc/source/javavm/javavm.cxx	3 Jan 2006 12:44:05 -0000	1.72
+++ openoffice.org/stoc/source/javavm/javavm.cxx	30 Jan 2006 10:12:21 -0000
@@ -868,6 +868,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
         {
         case JFW_E_NONE: bStarted = true; break;
         case JFW_E_NO_SELECT:
+        case JFW_E_VM_CREATION_FAILED:
         {
             // No Java configured. We silenty run the java configuration
             // Java.
@@ -934,6 +935,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
             continue;
             break;
         }
+#if 0
         case JFW_E_VM_CREATION_FAILED:
         {
             //Error:
@@ -950,6 +952,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
             askForRetry(css::uno::makeAny(exc));
             return css::uno::Any();
         }
+#endif
         case JFW_E_RUNNING_JVM:
         {
             //This service should make sure that we do not start java twice.


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1318
retrieving revision 1.1319
diff -u -r1.1318 -r1.1319
--- openoffice.org.spec	10 Oct 2007 14:02:55 -0000	1.1318
+++ openoffice.org.spec	10 Oct 2007 14:10:10 -0000	1.1319
@@ -146,6 +146,7 @@
 Patch64: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
 Patch65: openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
 Patch66: openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
+Patch67: openoffice.org-2.3.0.rh326161.jvmfwk.retryjvm.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1087,6 +1088,7 @@
 %patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
 %patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
 %patch66 -p1 -b .ooo81936.sc.maketypesagree.patch
+%patch67 -p1 -b .rh326161.jvmfwk.retryjvm.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2782,8 +2784,8 @@
 %changelog
 * Mon Oct 08 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.3
 - reenable prelink-optimized launchers
-- make code compiled with icedtea compatible with 1.5.0 so libgcj can
-  still be selected as a jvm
+- rhbz#326161 make code compiled with icedtea compatible with 1.5.0 so libgcj
+  can still be selected as a jvm
 
 * Sun Oct 07 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.2
 - reenable visibility again now that guard visibility is sane again