Merge

Thu, 15 Jan 2015 11:21:55 -0800

author
asaha
date
Thu, 15 Jan 2015 11:21:55 -0800
changeset 2679
ec98b7342a52
parent 2678
11d7833589dc
parent 2627
6fc251c9ebac
child 2680
79177246b3db

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Fri Jan 02 14:13:32 2015 -0800
     1.2 +++ b/.hgtags	Thu Jan 15 11:21:55 2015 -0800
     1.3 @@ -369,3 +369,4 @@
     1.4  94f30e5fde53e3ddcd3c4e9842349318eae8fe10 jdk8u40-b18
     1.5  0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u40-b19
     1.6  c3d6d1a5339952fbe4124e700407b7211446c99c jdk8u40-b20
     1.7 +9113c7c8d902ec94b28ca0ef4a6466bdba65fcfc jdk8u40-b21
     2.1 --- a/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java	Fri Jan 02 14:13:32 2015 -0800
     2.2 +++ b/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java	Thu Jan 15 11:21:55 2015 -0800
     2.3 @@ -155,7 +155,7 @@
     2.4           * Tests if a given package name is exported.
     2.5           */
     2.6          public boolean isExportedPackage(String pn) {
     2.7 -            if (Profile.getProfile(pn) != null) {
     2.8 +            if (Profile.getProfile(pn) != null || "javax.jnlp".equals(pn)) {
     2.9                  return true;
    2.10              }
    2.11              return exportedPackages.containsKey(pn) ? exportedPackages.get(pn) : false;

mercurial