[Ikvm-commit] ikvm/openjdk/java/util/zip ZipEntry.java,1.1,1.2

[Jeroen F. <jfr...@us...>]

Update of /cvsroot/ikvm/ikvm/openjdk/java/util/zip
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8725

Modified Files:
	ZipEntry.java 
Log Message:
Fixed time to dos time conversion.

Index: ZipEntry.java
===================================================================
RCS file: /cvsroot/ikvm/ikvm/openjdk/java/util/zip/ZipEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ZipEntry.java	16 Aug 2007 09:53:04 -0000	1.1
--- ZipEntry.java	23 Aug 2007 05:09:51 -0000	1.2
***************
*** 146,150 ****
      {
  	Date d = new Date(time);
! 	this.time = (Math.max(80, d.getYear()) << 25)
  	    | ((d.getMonth() + 1) << 21)
  	    | (d.getDate() << 16)
--- 146,154 ----
      {
  	Date d = new Date(time);
! 	if (d.getYear() < 80)
! 	{
! 	    d = new Date(80, 0, 1);
! 	}
! 	this.time = ((d.getYear() - 80) << 25)
  	    | ((d.getMonth() + 1) << 21)
  	    | (d.getDate() << 16)