-
Notifications
You must be signed in to change notification settings - Fork 5.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
8274397: [macOS] Stop setting env. var JAVA_MAIN_CLASS_<pid> in launcher code #5724
Closed
Closed
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
445d80b
8274397: [macOS] Stop setting env. var JAVA_MAIN_CLASS_<pid> in launc…
prrace 232bfae
8274397: [macOS] Stop setting env. var JAVA_MAIN_CLASS_<pid> in launc…
prrace 93108c5
8274397: [macOS] Stop setting env. var JAVA_MAIN_CLASS_<pid> in launc…
prrace 96a5590
8274397: Stop setting env. var JAVA_MAIN_CLASS_<pid> in launcher code
prrace 4c8fb9a
8274397: Stop setting env. var JAVA_MAIN_CLASS_<pid> in launcher code
prrace ffd77dd
8274397: Stop setting env. var JAVA_MAIN_CLASS_<pid> in launcher code
prrace File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
/* | ||
* Copyright (c) 2021, 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 | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
/** | ||
* @test | ||
* @bug 8274397 | ||
* @summary Ensure the app name system property is set on macOS | ||
* @requires os.family == "mac" | ||
* @compile MacOSAppNamePropertyTest.java SystemPropertyTest.java | ||
* @run main MacOSAppNamePropertyTest | ||
*/ | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
/* | ||
* If the system property apple.awt.application.name is unset, it should default | ||
* to the name of this test class. | ||
* If it is set, then it should be used instead of the class. | ||
* The arg. to the test indicates the *expected* name. | ||
* The test will fail if the property is not set or does not match | ||
*/ | ||
public class MacOSAppNamePropertyTest extends TestHelper { | ||
|
||
static final String APPNAME = "SystemPropertyTest"; | ||
|
||
public static void main(String[]args) { | ||
if (!isMacOSX) { | ||
return; | ||
} | ||
execTest(null, APPNAME); | ||
execTest("-Dapple.awt.application.name=Foo", "Foo"); | ||
} | ||
|
||
static void execTest(String propSetting, String expect) { | ||
List<String> cmdList = new ArrayList<>(); | ||
cmdList.add(javaCmd); | ||
if (propSetting != null) { | ||
cmdList.add(propSetting); | ||
} | ||
cmdList.add(APPNAME); | ||
cmdList.add(expect); | ||
TestResult tr = doExec(cmdList.toArray(new String[cmdList.size()])); | ||
if (!tr.isOK()) { | ||
System.err.println(tr.toString()); | ||
throw new RuntimeException("Test Fails"); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Copyright (c) 2021, 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 | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
|
||
/* | ||
* Child launched by MacOSAppNamePropertyTest.java | ||
* If the system property apple.awt.application.name is unset, it should default | ||
* to the name of this main program class, less any package name. | ||
* If it is set, then it should be used instead of the class name. | ||
* The arg. to the test indicates the *expected* name. | ||
* The test will fail if the property is not set or does not match | ||
*/ | ||
public class SystemPropertyTest { | ||
|
||
public static void main(String[]args) { | ||
String prop = System.getProperty("apple.awt.application.name"); | ||
if (prop == null) { | ||
throw new RuntimeException("Property not set"); | ||
} | ||
if (!prop.equals(args[0])) { | ||
throw new RuntimeException("Got " + prop + " expected " + args[0]); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure about error handling, the jkey is not removed when NULL_CHECK is used. Also an exceptions are not cleared in case of NULL_CHECK like in other cases, is it intentional?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well .. they aren't removed by the existing code either. And this is the launcher.
So far as I can tell if we error out of here (as I found when I made a typo in a method signature) the
VM exits very rapidly. So if I do anything here, it would be to remove DeleteLocalRef since it really doesn't matter to clean up local refs when you are either bailing from native .. or the entire process .. cleaning up when you are continuing on (as the code does) is perhaps more important since you might need more local refs before you are done.
Or file a separate bug against the launcher and JNI clean up after error handling.
java.base/share/native/libjli/java.c is a good example of where the same pattern exists.