From 8636555a673efec970b1573f45232a13f66506c1 Mon Sep 17 00:00:00 2001 From: shaper Date: Fri, 6 Sep 2002 02:36:12 +0000 Subject: [PATCH] Don't freak out if the splice() variant with no length parameter is passed a null values array. git-svn-id: https://samskivert.googlecode.com/svn/trunk@828 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../src/java/com/samskivert/util/ArrayUtil.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/projects/samskivert/src/java/com/samskivert/util/ArrayUtil.java b/projects/samskivert/src/java/com/samskivert/util/ArrayUtil.java index 57dc421d..6d60dadb 100644 --- a/projects/samskivert/src/java/com/samskivert/util/ArrayUtil.java +++ b/projects/samskivert/src/java/com/samskivert/util/ArrayUtil.java @@ -1,5 +1,5 @@ // -// $Id: ArrayUtil.java,v 1.15 2002/09/06 02:12:25 shaper Exp $ +// $Id: ArrayUtil.java,v 1.16 2002/09/06 02:36:12 shaper Exp $ // // samskivert library - useful routines for java programs // Copyright (C) 2001 Walter Korman @@ -325,7 +325,8 @@ public class ArrayUtil */ public static byte[] splice (byte[] values, int offset) { - return splice(values, offset, values.length - offset); + int length = (values == null) ? 0 : values.length - offset; + return splice(values, offset, length); } /** @@ -377,7 +378,8 @@ public class ArrayUtil */ public static int[] splice (int[] values, int offset) { - return splice(values, offset, values.length - offset); + int length = (values == null) ? 0 : values.length - offset; + return splice(values, offset, length); } /** @@ -429,7 +431,8 @@ public class ArrayUtil */ public static String[] splice (String[] values, int offset) { - return splice(values, offset, values.length - offset); + int length = (values == null) ? 0 : values.length - offset; + return splice(values, offset, length); } /** @@ -481,7 +484,8 @@ public class ArrayUtil */ public static Object[] splice (Object[] values, int offset) { - return splice(values, offset, values.length - offset); + int length = (values == null) ? 0 : values.length - offset; + return splice(values, offset, length); } /**