From cd1515cb2147422841dff288c53e6a7c97544219 Mon Sep 17 00:00:00 2001 From: mdb Date: Sun, 11 Dec 2005 23:06:35 +0000 Subject: [PATCH] Avoid NPE. git-svn-id: https://samskivert.googlecode.com/svn/trunk@1742 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../samskivert/src/java/com/samskivert/velocity/DataTool.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/samskivert/src/java/com/samskivert/velocity/DataTool.java b/projects/samskivert/src/java/com/samskivert/velocity/DataTool.java index 7e0b261c..04eecce4 100644 --- a/projects/samskivert/src/java/com/samskivert/velocity/DataTool.java +++ b/projects/samskivert/src/java/com/samskivert/velocity/DataTool.java @@ -26,7 +26,7 @@ public class DataTool */ public Object get (Object array, int index) { - return Array.get(array, index); + return (array == null) ? null : Array.get(array, index); } /** @@ -34,7 +34,7 @@ public class DataTool */ public int length (Object array) { - return Array.getLength(array); + return (array == null) ? 0 : Array.getLength(array); } /**