[kaffe] CVS kaffe (robilad): Fix for ant bootstrap in gump

Kaffe CVS cvs-commits at kaffe.org
Wed Jul 20 14:41:18 PDT 2005


PatchSet 6753 
Date: 2005/07/20 21:36:11
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Fix for ant bootstrap in gump

2005-07-20  Dalibor Topic  <robilad at kaffe.org>

        Fix for gump issue bootstrap-ant.

        * libraries/javalib/java/util/zip/ZipEntry.java (clone):
        New method. Taken from GNU Classpath.

Members: 
	ChangeLog:1.4278->1.4279 
	libraries/javalib/java/util/zip/ZipEntry.java:1.13->1.14 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4278 kaffe/ChangeLog:1.4279
--- kaffe/ChangeLog:1.4278	Wed Jul 20 02:23:48 2005
+++ kaffe/ChangeLog	Wed Jul 20 21:36:11 2005
@@ -1,3 +1,10 @@
+2005-07-20  Dalibor Topic  <robilad at kaffe.org>
+
+	Fix for gump issue bootstrap-ant.
+
+	* libraries/javalib/java/util/zip/ZipEntry.java (clone):
+	New method. Taken from GNU Classpath.
+
 2005-07-20  Wolfgang Baer <WBaer at gmx.de>
 
 	* po/de.po: Translation for German.
Index: kaffe/libraries/javalib/java/util/zip/ZipEntry.java
diff -u kaffe/libraries/javalib/java/util/zip/ZipEntry.java:1.13 kaffe/libraries/javalib/java/util/zip/ZipEntry.java:1.14
--- kaffe/libraries/javalib/java/util/zip/ZipEntry.java:1.13	Mon Mar 22 11:25:13 2004
+++ kaffe/libraries/javalib/java/util/zip/ZipEntry.java	Wed Jul 20 21:36:13 2005
@@ -16,6 +16,31 @@
 
 public class ZipEntry implements Cloneable, ZipConstants {
 
+    /* Clone method taken from GNU Classpath:
+     * Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+     */
+  /**
+   * Creates a copy of this zip entry.
+   */
+  /**
+   * Clones the entry.
+   */
+  public Object clone()
+  {
+    try
+      {
+	// The JCL says that the `extra' field is also copied.
+	ZipEntry clone = (ZipEntry) super.clone();
+	if (extra != null)
+	  clone.extra = (byte[]) extra.clone();
+	return clone;
+      }
+    catch (CloneNotSupportedException ex)
+      {
+	throw new InternalError();
+      }
+  }
+
   public static final int STORED = Deflater.NO_COMPRESSION;
   public static final int DEFLATED = Deflater.DEFLATED;
 



More information about the kaffe mailing list