Mercurial > hg > release > icedtea6-1.4
changeset 1238:d742b7a1cb5e
* patches/icedtea-version.patch: Remove accidentially added debug patch.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Wed, 03 Dec 2008 00:48:36 +0100 |
| parents | 7eca1fba7ef1 |
| children | 98f6e678b3ce |
| files | ChangeLog patches/icedtea-version.patch |
| diffstat | 2 files changed, 5 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Dec 03 00:45:09 2008 +0100 +++ b/ChangeLog Wed Dec 03 00:48:36 2008 +0100 @@ -1,3 +1,8 @@ +2008-12-02 Mark Wielaard <mark@klomp.org> + + * patches/icedtea-version.patch: Remove accidentially added debug + patch. + 2008-12-02 Mark Wielaard <mark@klomp.org> * overlays/openjdk/jdk/test/closed/sun/security/rsa/keystore.bad,
--- a/patches/icedtea-version.patch Wed Dec 03 00:45:09 2008 +0100 +++ b/patches/icedtea-version.patch Wed Dec 03 00:48:36 2008 +0100 @@ -26,34 +26,3 @@ endif ifdef BUILD_NUMBER ---- openjdk.orig/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java 2008-11-05 10:27:27.000000000 +0100 -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java 2008-11-24 21:47:38.000000000 +0100 -@@ -138,7 +138,15 @@ - tableHeaderEnd(); - Iterator it = usingPackageToUsedClasses.keySet().iterator(); - while (it.hasNext()) { -- PackageDoc pkg = configuration.root.packageNamed((String)it.next()); -+ String pkgstr = (String)it.next(); -+ PackageDoc pkg = configuration.root.packageNamed(pkgstr); -+ if (pkg == null) -+ { -+ System.err.println("null package returned for '" -+ + pkgstr + "', which uses package '" -+ + Util.getPackageName(pkgdoc) -+ + "'"); -+ } - generatePackageUse(pkg); - } - tableEnd(); -@@ -195,7 +203,10 @@ - trBgcolorStyle("white", "TableRowColor"); - summaryRow(0); - //Just want an anchor here. -- printHyperLink("", pkg.name(), Util.getPackageName(pkg), true); -+ if (pkg != null) -+ printHyperLink("", pkg.name(), Util.getPackageName(pkg), true); -+ else -+ printHyperLink("WHOA!", "PKG IS NULL", Util.getPackageName(pkg), true); - summaryRowEnd(); - summaryRow(0); - if (pkg != null) {