Uploaded image for project: 'JDK'
  1. JDK
  2. JDK-6743243

Incomplete updating of j2se in 6u10 from 6u7: test cases and files that should have been deleted

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed
    • Priority: P3
    • Resolution: Fixed
    • Affects Version/s: 6u10
    • Fix Version/s: 6u13
    • Component/s: infrastructure
    • Labels:
      None
    • Subcomponent:
    • Resolved In Build:
      b01
    • CPU:
      generic
    • OS:
      generic
    • Verification:
      Verified

      Description

      There are at least 54 files that were updated in 6u7, but never updated to the 6u10 and now 6u11. Fortunately, the ones I've found all seem to be tests and deleted files, however if any of these deleted files are autobuilt using the automatic mechanism, they could be reincluded in the builds.

      What led me to this bug was that a test case for the following bug was failing in 6u10:

      6687392: Removal of obsolete protocol handlers [Christopher.Hegarty, Michael.McMahon]

      I found that the Makefile had the right fix, but test/java/net/URI/URItoURLTest.java was never updated, and all of the files which should have been deleted for 6687392 weren't. Fortunately, these files were specifically listed in j2se/make/sun/net/FILES_java.gmk and not built by the automatic file listing mechanism, otherwise, we'd still be shipping those files.

      This appears to be caused from an incomplete putback done by "jdeploy" on Jun 12th, 2008. No deleted_files or test files were putback in that putback.

      A simple putback -n of 6u7 vs 6u10 report other potential problems.

      update: test/java/net/URI/URItoURLTest.java
      conflict: test/java/util/TimeZone/aliases.txt
      conflict: test/java/util/TimeZone/displayname.txt
      conflict: test/java/util/TimeZone/TimeZoneData/VERSION
      conflict: test/java/util/TimeZone/TimeZoneData/year2008
      conflict: test/java/util/TimeZone/TimeZoneData/year2009
      conflict: test/java/util/TimeZone/TimeZoneData/year2010
      conflict: test/java/util/TimeZone/TimeZoneData/year2011
      conflict: test/java/util/TimeZone/TimeZoneData/year2012
      rename from: src/share/classes/sun/net/www/protocol/doc/DocURLConnection.java
               to: deleted_files/src/share/classes/sun/net/www/protocol/doc/DocURLConn
      ection.java
      rename from: src/share/classes/sun/net/www/protocol/doc/Handler.java
               to: deleted_files/src/share/classes/sun/net/www/protocol/doc/Handler.java
      rename from: src/share/classes/sun/net/www/protocol/systemresource/Handler.java
               to: deleted_files/src/share/classes/sun/net/www/protocol/systemresource/Handler.java
      rename from: src/share/classes/sun/net/www/protocol/systemresource/SystemResourceURLConnection.java
               to: deleted_files/src/share/classes/sun/net/www/protocol/systemresource/SystemResourceURLConnection.java
      rename from: src/share/classes/sun/net/www/protocol/verbatim/Handler.java
               to: deleted_files/src/share/classes/sun/net/www/protocol/verbatim/Handler.java
      create: test/com/sun/org/apache/xml/internal/utils/Test.java
      create: test/com/sun/org/apache/xml/internal/utils/Test6607339.sh
      create: test/com/sun/org/apache/xml/internal/utils/target.xml
      create: test/java/lang/Enum/CloneEnumConstant.java
      create: test/java/plugin/6581221/README
      create: test/java/plugin/6581221/Test6581221.java
      create: test/java/plugin/misc/6656520/README
      create: test/java/plugin/misc/6656520/Test6656520.java
      create: test/java/security/cert/newCertEntry/Cert_signatures
      create: test/java/security/cert/newCertEntry/TestCertEntry.sh
      create: test/javax/script/6529568/ScriptApplet.java
      create: test/javax/script/6529568/Test6529568.html
      create: test/javax/script/6529568/Test6529568.java
      create: test/javax/script/6529568/Test6529568.sh
      create: test/javax/script/6529579/Test6529579.html
      create: test/javax/script/6529579/Test6529579.java
      create: test/javax/script/6529579/Test6529579.sh
      create: test/javax/script/6529579/TimeZoneAttackApplet.java
      create: test/javax/script/6529579/TimeZoneUserApplet.java
      create: test/javax/xml/stream/Events/Test6620632.java
      create: test/javax/xml/stream/XMLStreamReaderTest/SupportDTD.java
      create: test/share/Check64Bit.java
      create: test/share/CheckIaAmd64.java
      create: test/share/ShowLiveStatus.java
      create: test/share/TestConsole.java
      create: test/share/TestConsoleDone.java
      create: test/share/TestDone.java
      create: test/share/TestDoneCancel.java
      create: test/share/TestDoneInst.java
      create: test/share/TestPassFail.java
      create: test/share/TestPassFailInst.java
      create: test/share/TestStartCancel.java
      create: test/share/getUserHome.java
      create: test/share/gold_clsid.txt
      create: test/share/jemmy.jar
      create: test/share/msvcrtd-amd64.jar
      create: test/share/msvcrtd-ia64.jar
      create: test/share/msvcrtd.jar
      create: test/share/reg.jar
      create: test/sun/management/jmxremote/bootstrap/LocalOnlyTest.java

      The source directory seems to be up to date, but this should be double-checked before we ship 6u11.

        Attachments

          Activity

            People

            Assignee:
            katleman David Katleman (Inactive)
            Reporter:
            wetmore Bradford Wetmore
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved:
              Imported:
              Indexed: