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

8039231: [javadoc] test failure caused by javax.crypto fix

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Kumar Srinivasan 2014-04-04 18:36:16 -07:00
parent def40f4158
commit 73d4a30ede
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java
View File

@ -147,6 +147,8 @@ public abstract class Profiles {
final int maxProfile = 4; // Three compact profiles plus full JRE
MakefileProfiles(Properties p) {
// consider crypto, only if java/lang package exists
boolean foundJavaLang = false;
for (int profile = 1; profile <= maxProfile; profile++) {
String prefix = (profile < maxProfile ? "PROFILE_" + profile : "FULL_JRE");
String inclPackages = p.getProperty(prefix + "_RTJAR_INCLUDE_PACKAGES");
@ -155,6 +157,8 @@ public abstract class Profiles {
for (String pkg: inclPackages.substring(1).trim().split("\\s+")) {
if (pkg.endsWith("/"))
pkg = pkg.substring(0, pkg.length() - 1);
if (foundJavaLang == false && pkg.equals("java/lang"))
foundJavaLang = true;
includePackage(profile, pkg);
}
String inclTypes = p.getProperty(prefix + "_RTJAR_INCLUDE_TYPES");
@ -179,7 +183,8 @@ public abstract class Profiles {
* javax/net/ssl package. Thus, this package is added to compact1,
* implying that it should exist in all three profiles.
*/
includePackage(1, "javax/crypto");
if (foundJavaLang)
includePackage(1, "javax/crypto");
}
@Override