summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-08-06 20:36:32 +0000
committerMark Wielaard <mark@klomp.org>2006-08-06 20:36:32 +0000
commit88a5be620140ea0819439b6a7ab413de2c6c22d2 (patch)
tree89fd78a3d512a39b5169b7a2c1a5a82e8dc175b0
parent8883c03e9f391474267d9cee1dd1ce5865ae888f (diff)
downloadclasspath-88a5be620140ea0819439b6a7ab413de2c6c22d2.tar.gz
PR 28555
Suggested by Matthew Burgess <matthew@linuxfromscratch.org> * gnu/xml/transform/ApplyTemplatesNode.java (clone): Check whether withParams is null. * gnu/xml/transform/ForEachNode.java (clone): Check whether sortKeys is null.
-rw-r--r--ChangeLog9
-rw-r--r--gnu/xml/transform/ApplyTemplatesNode.java2
-rw-r--r--gnu/xml/transform/ForEachNode.java2
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 07bd1163c..e08476d4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-06 Mark Wielaard <mark@klomp.org>
+
+ PR 28555
+ Suggested by Matthew Burgess <matthew@linuxfromscratch.org>
+ * gnu/xml/transform/ApplyTemplatesNode.java (clone): Check whether
+ withParams is null.
+ * gnu/xml/transform/ForEachNode.java (clone): Check whether
+ sortKeys is null.
+
2006-08-06 Roman Kennke <kennke@aicas.com>
* NEWS: Added note about the X peers.
diff --git a/gnu/xml/transform/ApplyTemplatesNode.java b/gnu/xml/transform/ApplyTemplatesNode.java
index 38b605a07..041809bdf 100644
--- a/gnu/xml/transform/ApplyTemplatesNode.java
+++ b/gnu/xml/transform/ApplyTemplatesNode.java
@@ -80,7 +80,7 @@ final class ApplyTemplatesNode
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));
diff --git a/gnu/xml/transform/ForEachNode.java b/gnu/xml/transform/ForEachNode.java
index c8f51a6fe..25b824534 100644
--- a/gnu/xml/transform/ForEachNode.java
+++ b/gnu/xml/transform/ForEachNode.java
@@ -67,7 +67,7 @@ final class ForEachNode
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));