6971706: sun/nio/cs/ext/* classes are duplicated between rt.jar, charsets.jar, and localedata.jar

Alan Bateman Alan.Bateman at oracle.com
Sun Sep 5 19:04:58 UTC 2010


I notice that test/sun/nio/cs/Test4200310.sh is currently failing in 
jdk7. Sherman's changes for 6964313 [1] resolved most of the issue by 
moving the X11 charsets out of rt.jar but their inner classes are still 
going into both charsets.jar and rt.jar, causing this test to fail. 
Kelly or Sherman, do you mind reviewing this small patch to add escaping 
so that it works as originally intended?  -- Alan.

diff -r 5cf79568f0b9 make/common/Release.gmk
--- a/make/common/Release.gmk   Sat Sep 04 15:37:26 2010 -0400
+++ b/make/common/Release.gmk   Sun Sep 05 19:49:35 2010 +0100
@@ -573,13 +573,13 @@ NOT_RT_JAR_LIST = $(ABS_TEMPDIR)/not_rt_
        $(ECHO) "sun/jvmstat/" >> $@
        $(ECHO) "sun/nio/cs/ext/" >> $@
        $(ECHO) "sun/awt/HKSCS.class" >> $@
-       $(ECHO) "sun/awt/motif/X11GB2312$Decoder.class" >> $@
-       $(ECHO) "sun/awt/motif/X11GB2312$Encoder.class" >> $@
+       $(ECHO) "sun/awt/motif/X11GB2312\$$Decoder.class" >> $@
+       $(ECHO) "sun/awt/motif/X11GB2312\$$Encoder.class" >> $@
        $(ECHO) "sun/awt/motif/X11GB2312.class" >> $@
-       $(ECHO) "sun/awt/motif/X11GBK$Encoder.class" >> $@
+       $(ECHO) "sun/awt/motif/X11GBK\$$Encoder.class" >> $@
        $(ECHO) "sun/awt/motif/X11GBK.class" >> $@
-       $(ECHO) "sun/awt/motif/X11KSC5601$Decoder.class" >> $@
-       $(ECHO) "sun/awt/motif/X11KSC5601$Encoder.class" >> $@
+       $(ECHO) "sun/awt/motif/X11KSC5601\$$Decoder.class" >> $@
+       $(ECHO) "sun/awt/motif/X11KSC5601\$$Encoder.class" >> $@
        $(ECHO) "sun/awt/motif/X11KSC5601.class" >> $@
        $(ECHO) "sun/rmi/rmic/" >> $@
        $(ECHO) "sun/tools/asm/" >> $@

[1] http://hg.openjdk.java.net/jdk7/tl/jdk/rev/a3747592bdf7






More information about the build-dev mailing list