[cp-patches] FYI: Fix PR28555

[Mark Wielaard]

Hi,

This fixes the problem reported in
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28555

2006-08-06  Mark Wielaard  <[EMAIL PROTECTED]>

    PR 28555
    Suggested by Matthew Burgess <[EMAIL PROTECTED]>
    * gnu/xml/transform/ApplyTemplatesNode.java (clone): Check whether
    withParams is null.
    * gnu/xml/transform/ForEachNode.java (clone): Check whether
    sortKeys is null.

Committed to trunk, release and generics branch.

Cheers,

Mark

Index: gnu/xml/transform/ApplyTemplatesNode.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/transform/ApplyTemplatesNode.java,v
retrieving revision 1.6
diff -u -r1.6 ApplyTemplatesNode.java
--- gnu/xml/transform/ApplyTemplatesNode.java	30 Jan 2006 13:44:12 -0000	1.6
+++ gnu/xml/transform/ApplyTemplatesNode.java	6 Aug 2006 20:26:10 -0000
@@ -80,7 +80,7 @@
     List sortKeys2 = new ArrayList(len);
     for (int i = 0; i < len; i++)
       sortKeys2.add(((Key) sortKeys.get(i)).clone(stylesheet));
-    len = withParams.size();
+    len = withParams != null ? withParams.size() : 0;
     List withParams2 = new ArrayList(len);
     for (int i = 0; i < len; i++)
       withParams2.add(((WithParam) withParams.get(i)).clone(stylesheet));
Index: gnu/xml/transform/ForEachNode.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/transform/ForEachNode.java,v
retrieving revision 1.5
diff -u -r1.5 ForEachNode.java
--- gnu/xml/transform/ForEachNode.java	13 Jan 2006 17:23:31 -0000	1.5
+++ gnu/xml/transform/ForEachNode.java	6 Aug 2006 20:26:10 -0000
@@ -67,7 +67,7 @@
 
   TemplateNode clone(Stylesheet stylesheet)
   {
-    int len = sortKeys.size();
+    int len = sortKeys != null ? sortKeys.size() : 0;
     List sortKeys2 = new ArrayList(len);
     for (int i = 0; i < len; i++)
       sortKeys2.add(((Key) sortKeys.get(i)).clone(stylesheet));