PatchSet 5540
Date: 2005/02/14 20:57:46
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: awt fixlet
2005-02-14 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2005-02-12 Mark Wielaard <[EMAIL PROTECTED]>
Fixes bug #11949
* java/awt/BasicStroke.java (hashCode): Check for null dash.
Members:
ChangeLog:1.3584->1.3585
libraries/javalib/java/awt/BasicStroke.java:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3584 kaffe/ChangeLog:1.3585
--- kaffe/ChangeLog:1.3584 Mon Feb 14 20:49:21 2005
+++ kaffe/ChangeLog Mon Feb 14 20:57:46 2005
@@ -2,6 +2,15 @@
Resynced with GNU Classpath.
+ 2005-02-12 Mark Wielaard <[EMAIL PROTECTED]>
+
+ Fixes bug #11949
+ * java/awt/BasicStroke.java (hashCode): Check for null dash.
+
+2005-02-14 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2005-02-11 Andrew John Hughes <[EMAIL PROTECTED]>
* gnu/java/awt/color/ClutProfileConverter.java,
Index: kaffe/libraries/javalib/java/awt/BasicStroke.java
diff -u kaffe/libraries/javalib/java/awt/BasicStroke.java:1.6
kaffe/libraries/javalib/java/awt/BasicStroke.java:1.7
--- kaffe/libraries/javalib/java/awt/BasicStroke.java:1.6 Sat Jan 22
18:55:30 2005
+++ kaffe/libraries/javalib/java/awt/BasicStroke.java Mon Feb 14 20:57:56 2005
@@ -222,9 +222,10 @@
hash ^= cap;
hash ^= join;
hash ^= Float.floatToIntBits(limit);
-
- for (int i = 0; i < dash.length; i++)
- hash ^= Float.floatToIntBits(dash[i]);
+
+ if (dash != null)
+ for (int i = 0; i < dash.length; i++)
+ hash ^= Float.floatToIntBits(dash[i]);
hash ^= Float.floatToIntBits(phase);
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
