summaryrefslogtreecommitdiff
path: root/jvmfwk
AgeCommit message (Collapse)Author
2017-04-13Replace a use of CJavaInfo with std::unique_ptr<JavaInfo>Stephan Bergmann
Change-Id: I89cb19969285200a61c47d29e819a50845fa692b
2017-04-13More std::unique_ptr<JavaInfo> lifecycle managementStephan Bergmann
Change-Id: If53347633ec4b2f8c2b221ba2057e0c38fa97b67
2017-04-13Simplify passing options to jfw_startVMStephan Bergmann
Change-Id: Idac31e282fe4df69449298a03d491473e460c742 Reviewed-on: https://gerrit.libreoffice.org/36495 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-04-13Removed duplicated includesAndrea Gelmini
No automatic tools. Manual checked and tested. Change-Id: Ife260fa4e1d786cf81f2917a901664cc54943754 Reviewed-on: https://gerrit.libreoffice.org/36371 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-04-12Remove unused jfw::VendorSettings instantiationsStephan Bergmann
Change-Id: I0af90fbb9eb77e5e65b29a79cc3b37af8cfc75e6
2017-04-12Remove unnecessary copyStephan Bergmann
Change-Id: Ib350999ddf3ed2753b9e615a07b963c459dc714b
2017-04-12Remove unused function pointer typedefsStephan Bergmann
Change-Id: I51ee45dba007e5709b1516c36b029f940ea7153e
2017-04-12Convert rtl_uString -> OUString in jfw_get/setVMParametersStephan Bergmann
Change-Id: I55f96873661f686cd9625d69523718ccb54659dc
2017-04-12Simplify jfw::VersionInfoStephan Bergmann
Change-Id: I2cc1071bbaf9c68fbd621d6c0c6953b7646b1a62
2017-04-12Convert some rtl_uString -> OUString in jvmfwkStephan Bergmann
Change-Id: I08de5cab29dabc6fd824d5df8bac12c8520a05ae
2017-04-12Silence -Werror=unused-parameter on AndroidStephan Bergmann
Change-Id: I69cd0724c2c4a6f82f89080b0622e734617c5704
2017-04-11Assert obvious preconditions instead of returning javaPluginError:InvalidArgStephan Bergmann
Change-Id: I93bb3aaa0106bce98995f843ee036c9570f6aaf0
2017-04-11Calls to jvmfwk/framework.hxx must not pass in null, drop JFW_E_INVALID_ARGStephan Bergmann
Change-Id: Iff4b8ccc79e194f645791ac73818e3b677ae32a6
2017-04-11Fix missing derefStephan Bergmann
...lacking since recent f0454e72c1d1b11c3bcbacb23048a62fdecd037c "Use std::unique_ptr<JavaInfo> for lifecycle management in jvmfwk/framework.hxx" Change-Id: Ied39be52ccc8cbef48cdfb4933e4ac1914fd0fd3
2017-04-11sal_Bool -> boolStephan Bergmann
Change-Id: If632eb547aa5082ad13eac8c2ad39a1742309fc7
2017-04-11Let jfw_isVMRunning return the result; there are no error conditionsStephan Bergmann
Change-Id: I004b3d6f6b7b32d1bb41072d7fdd4a66f944d992
2017-04-11sal_Bool -> boolStephan Bergmann
Change-Id: Iec70d6726e36af607a0a5b5a0f6dc86d05322435
2017-04-11jfw_existJRE requires non-null args, never returns JFW_E_INVALID_ARGStephan Bergmann
Change-Id: I2067b77393427a5a6a4273c2f609ff8d335f436a
2017-04-11sal_Bool -> boolStephan Bergmann
Change-Id: I8df49f349308cc17d684d5c0e8215aa628dfaeda
2017-04-11Use std::unique_ptr<JavaInfo> for lifecycle management in jvmfwk/framework.hxxStephan Bergmann
Change-Id: Ie604c75e92c407ff3118aaa58155648d956c91fb
2017-04-11Remove unnecessary jfw::CJavaInfo::cloneJavaInfoStephan Bergmann
Change-Id: Ia9e807c0d1e5b0664d711c551a5e70afccbcc564
2017-03-23Remove unused #include <ctype.h>Stephan Bergmann
Change-Id: I8bf3e30687e20151a9e1936e69362abfe9b3a99d
2017-03-22Use rtl::isAscii* instead of ctype.h is* (and fix passing plain char)Stephan Bergmann
Change-Id: I18f9a2ad4506edc76b74dde229f2fd296bffed88
2017-03-22jvmfwk: fix JVM detection on 64-bit WindowsMichael Stahl
_WIN32 is also defined on 64-bit Windows so reorder these ifdefs. Should i be surprised that this breaks several dbaccess tests for me but all tinderboxes are green? (regression from 9143dd4ebe37b608e43d04434cf831624bf55b65) Change-Id: Id917952d3135768355af711688ff70bf6c019a6e
2017-03-19Fix typo for "expression"Julien Nabet
Change-Id: Iad0728fe53912d85ee40ef1b39d476a47aaad2d2 Reviewed-on: https://gerrit.libreoffice.org/35433 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2017-03-13Unnecessary OUString instancesStephan Bergmann
Change-Id: I81a59c7847e2109198a35cbdb49f5bcf3505c4ba
2017-03-13Related tdf#54443 List only matching JREsSamuel Mehrbrodt
I.e. show only 64bit JRE for 64bit LO and 32bit JRE for 32bit LO Change-Id: Id5e890637c7e1014bcb4e6fdd9ed9a33765112d5 Reviewed-on: https://gerrit.libreoffice.org/35026 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-03-09jvmfwk: Improve logging outputSamuel Mehrbrodt
Change-Id: I476fc3190902e44bedfd2e713bd1a7cfb0733688 Reviewed-on: https://gerrit.libreoffice.org/35024 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-03-03Remove redundant 'inline' keywordStephan Bergmann
...from function definitions occurring within class definitions. Done with a rewriting Clang plugin (to be pushed later). Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8 Reviewed-on: https://gerrit.libreoffice.org/34874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-03-03Typo: requirments -> requirementsSamuel Mehrbrodt
Change-Id: I02c5846eb51071e1a958c3d65e150fb7cbc7d58a Reviewed-on: https://gerrit.libreoffice.org/34873 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-03-02Fix typosAndrea Gelmini
Change-Id: Ic6c41fbcc36c11a7528cde0986593a39c2d6738b Reviewed-on: https://gerrit.libreoffice.org/34803 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-24Make JVM -Xrunjdwp option work on macOSStephan Bergmann
I hope loading the jvm library as SAL_LOADMODULE_GLOBAL has no negative consequences (at least, there is prior art in the LINUX case already). Change-Id: If18b65bd96f7205fdf9fd41389e64e786c15af16
2017-01-24loplugin: unnecessary destructor jvmfwk..lotuswordproNoel Grandin
Change-Id: Iaa4f9b178ab265342255066af7fff09f5b33ab37 Reviewed-on: https://gerrit.libreoffice.org/33496 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-01-17replace #ifdef SOLARIS with #ifdef __sunMichael Stahl
Check for a macro that is defined by the compiler, we don't really need one defined by the build system. Change-Id: Iccb8e3198396881395c97a6b81690ebe64b7e9d2
2017-01-17new loplugin: useuniqueptr: jvmfwk..saxNoel Grandin
Change-Id: I732e2e22c6f953f0982fbc8833453e7c23cf9d49 Reviewed-on: https://gerrit.libreoffice.org/33166 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-01-09New loplugin:externvar: jvmfwkStephan Bergmann
Change-Id: I0fee834ba07ecdc713e0e066935773f49a109665
2016-12-25tdf#95416 Fix include filetamsil1amani3
Moved elements.hxx and fwkutil.hxx to jvmfwk/inc and changed the #include line in vendorplugin.hxx Change-Id: Ida7395e952c482af92c0561a7756be7cd0578b9f Reviewed-on: https://gerrit.libreoffice.org/32415 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-11-16Fix regression in bubbleSortVersionStephan Bergmann
...introduced with 789055bc2acb4c71483fd60ea258d158bd5aec10 "clang-tidy performance-unnecessary-copy-initialization" (so partially revert it). Whatever clang-tidy erroneously reported there, cur and next are lvalue references into vec, so this attempted copy now actually overwrote one with the other. The result was that if multiple JREs are detected on the system, "Options - LibreOffice - Advanced" would list a single one multiple times. Change-Id: I7ef454c0f37669722812383848602dc2bacf7cd1
2016-11-16Clean up jfw_findAllJREs return value computationStephan Bergmann
Change-Id: Iace2281ec4b5cfaa6e1de44b58a6705ca3a18c58
2016-11-08loplugin:unnecessaryvirtual in hwpfilter..rscNoel Grandin
Change-Id: I2e9df8223d503b813b4c458747e8c44bb8ef8868 Reviewed-on: https://gerrit.libreoffice.org/30661 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-11-01Clean up javavendors_*.xml filesStephan Bergmann
...and drop unnecessary javavendors_template.xml Change-Id: Ib7f2d595d2086c1d3bf324f19693b9032cf00cd7
2016-11-01quickfix: Automatic selection of Oracle Java runtime on macOSStephan Bergmann
same issue as 36f637f7f21906fa3f37223e69b044db52036fb1 "tdf#103507 quickfix: Automatic selection of Oracle Java runtime on Windows" Change-Id: I3239bbf52263fb53bcd0ed54e8e983bda3b19182
2016-10-28tdf#103507 quickfix: Automatic selection of Oracle Java runtime on WindowsStephan Bergmann
...which had been broken since 5e9a2e9b0f33ab50aa3a84728db75383aede19d9 "Check each potential JRE location only once", as jfw_findAndSelectJRE calls jfw_plugin_getAllJavaInfos on each vendor in turn, but that now only operates on any items newly added by addAllJREInfos, so the first call to jfw_plugin_getAllJavaInfos (with sVendor being "Sun Microsystems Inc." unsuccesfully operated on all items, and the next call (with sVendor being "Oracle Corporation") didn't see any further items to operate on. So the quickfix (at least for any Java runtimes by Oracle) is to reorder the vendors in javavendors_wnt.xml. The proper fix will be to reorder the code so it obtains the list of all Java runtimes only once, and then matches that list against the known vendors. (Other plaforms appear not to be affected by this issue. Some jvmfwk/distributions/OpenOfficeorg/javavendors_*.xml already sort Oracle first, anyway. And e.g. on Linux, jfw_findAndSelectJRE typically already succeeds with calling jfw_plugin_getJavaInfosFromPath and so doesn't reach the problematic code. Change-Id: Ied571ae1d4745d53ce0c8697d0f1b268e1aac407
2016-10-16clang-cl loplugin: jvmfwkStephan Bergmann
Change-Id: I4ae0795469e70d6be3d2052d96a2f0dad3920d8b Reviewed-on: https://gerrit.libreoffice.org/29860 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-09-13loplugin:override: No more need for the "MSVC dtor override" workaroundStephan Bergmann
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
2016-08-05(initial) sparc64 portJames Clarke
Change-Id: I8ec9bb5415a9e6b9083ba89a7790872d67625de1
2016-07-22Related: tdf#101057 inherit MalformedVersionException from std::exceptionCaolán McNamara
so we don't get std::terminate on MacOSX if its thrown up to JavaVirtualMachine::getJavaVM Change-Id: I1c6b79bf16cbaa66b8f79d495239e301d3ca58de
2016-07-22Related: tdf#101057 allow java update version number > 99Caolán McNamara
Change-Id: Icc37cf248fbf35f108eb5bbb25c36fbd54a9fe85
2016-07-08loplugin:redundantcast: redundant static_casts in jvmfwkStephan Bergmann
Change-Id: I6aef36bd21043460e74b5e3d478665a35213bb1a
2016-07-04Fix some spelling errors in comments and stringsOtto Kekäläinen
Change-Id: Iecd6b5e13d6be14651f77d8e37f01117ba15a11e Reviewed-on: https://gerrit.libreoffice.org/26883 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>