stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8312488: tools/jpackage/share/AppLauncherEnvTest.java fails with dynamically linked libstdc++

Browse Source 
Reviewed-by: asemenyuk, almatvee
This commit is contained in:
Vladimir Petko 2023-07-25 20:12:23 +00:00 committed by Alexey Semenyuk
parent cb82c954e3
commit 78a8a99d99
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jdk.jpackage/share/native/common/app.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,7 +35,7 @@
namespace {
const std::string* theLastErrorMsg = 0;
NopLogAppender nopLogAppender;
char nopLogAppenderMemory[sizeof(NopLogAppender)] = {};
class StandardLogAppender : public LogAppender {
public:
@ -46,7 +46,9 @@ public:
<< ": " << v.message
<< std::endl;
}
} standardLogAppender;
};
char standardLogAppenderMemory[sizeof(StandardLogAppender)] = {};
class LastErrorLogAppender : public LogAppender {
public:
@ -114,10 +116,13 @@ bool isWithLogging() {
int launch(const std::nothrow_t&,
LauncherFunc func, LogAppender* lastErrorLogAppender) {
// The log appender is set for the lifetime of the application.
// Use in-place new to avoid accessing destroyed instance
// when the shared object destructor logs something.
if (isWithLogging()) {
Logger::defaultLogger().setAppender(standardLogAppender);
Logger::defaultLogger().setAppender(*new (standardLogAppenderMemory) StandardLogAppender());
} else {
Logger::defaultLogger().setAppender(nopLogAppender);
Logger::defaultLogger().setAppender(*new (nopLogAppenderMemory) NopLogAppender());
}
LOG_TRACE_FUNCTION();