[build] Failure in org.apache.harmony.pack200.tests.PackingOptionsTest.testModificationTime - commit fix or not?

[Sian January]

I think the failure that the Hudson build and Ray are seeing in
pack200 is a regression introduced in r996801 (i.e. since the last
milestone).  I can't reproduce it due to being in the UK where the
timezone offset is 0, but the fix should be as follows:


Index: src/main/java/org/apache/harmony/pack200/FileBands.java
===================================================================
--- src/main/java/org/apache/harmony/pack200/FileBands.java     (revision 
1002186)
+++ src/main/java/org/apache/harmony/pack200/FileBands.java     (working copy)
@@ -22,6 +22,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.TimeZone;

 import org.apache.harmony.pack200.Archive.PackingFile;
 import org.apache.harmony.pack200.Archive.SegmentUnit;
@@ -92,7 +93,7 @@
             totalSize += file_size[i];

             // update modification time
-            modtime = (packingFile.getModtime()) / 1000L;
+            modtime = (packingFile.getModtime() +
TimeZone.getDefault().getRawOffset()) / 1000L;
             file_modtime[i] = (int) (modtime - archiveModtime);
             if (isLatest && latestModtime < file_modtime[i]) {
                 latestModtime = file_modtime[i];






Any support to commit before M16 or should we leave it until afterwards?

Thanks,

Sian


-- 
Unless stated otherwise above:
IBM United Kingdom Limited - Registered in England and Wales with number 741598.
Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU