changeset 2681:ec98b7342a52

Merge
author asaha
date Thu, 15 Jan 2015 11:21:55 -0800
parents 11d7833589dc 6fc251c9ebac
children 79177246b3db
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jan 02 14:13:32 2015 -0800
+++ b/.hgtags	Thu Jan 15 11:21:55 2015 -0800
@@ -369,3 +369,4 @@
 94f30e5fde53e3ddcd3c4e9842349318eae8fe10 jdk8u40-b18
 0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u40-b19
 c3d6d1a5339952fbe4124e700407b7211446c99c jdk8u40-b20
+9113c7c8d902ec94b28ca0ef4a6466bdba65fcfc jdk8u40-b21
--- a/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java	Fri Jan 02 14:13:32 2015 -0800
+++ b/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java	Thu Jan 15 11:21:55 2015 -0800
@@ -155,7 +155,7 @@
          * Tests if a given package name is exported.
          */
         public boolean isExportedPackage(String pn) {
-            if (Profile.getProfile(pn) != null) {
+            if (Profile.getProfile(pn) != null || "javax.jnlp".equals(pn)) {
                 return true;
             }
             return exportedPackages.containsKey(pn) ? exportedPackages.get(pn) : false;