summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFrantisek Sodomka <fsodomka@gmail.com>2009-08-06 22:29:14 +0200
committerChouser <chouser@n01se.net>2009-09-07 16:51:21 -0400
commit270185aba54cef1d8ce59ec347b5623f2e502afe (patch)
treee2237ed0dcbcb1403baf1ce499db60fdf1567d4c /src
parent2474dad2a56b32527bb6ee10545ee3de476bc583 (diff)
fixed NPE when creating an empty array of ints, longs, floats or doubles, fixes #146
Signed-off-by: Chouser <chouser@n01se.net>
Diffstat (limited to 'src')
-rw-r--r--src/jvm/clojure/lang/Numbers.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/jvm/clojure/lang/Numbers.java b/src/jvm/clojure/lang/Numbers.java
index 043f9ae2..8d5fd855 100644
--- a/src/jvm/clojure/lang/Numbers.java
+++ b/src/jvm/clojure/lang/Numbers.java
@@ -1436,7 +1436,7 @@ static BitOps bitOps(Object x){
else
{
ISeq s = RT.seq(sizeOrSeq);
- int size = s.count();
+ int size = RT.count(s);
float[] ret = new float[size];
for(int i = 0; i < size && s != null; i++, s = s.next())
ret[i] = ((Number) s.first()).floatValue();
@@ -1467,7 +1467,7 @@ static public double[] double_array(Object sizeOrSeq){
else
{
ISeq s = RT.seq(sizeOrSeq);
- int size = s.count();
+ int size = RT.count(s);
double[] ret = new double[size];
for(int i = 0; i < size && s != null; i++, s = s.next())
ret[i] = ((Number) s.first()).doubleValue();
@@ -1498,7 +1498,7 @@ static public int[] int_array(Object sizeOrSeq){
else
{
ISeq s = RT.seq(sizeOrSeq);
- int size = s.count();
+ int size = RT.count(s);
int[] ret = new int[size];
for(int i = 0; i < size && s != null; i++, s = s.next())
ret[i] = ((Number) s.first()).intValue();
@@ -1529,7 +1529,7 @@ static public long[] long_array(Object sizeOrSeq){
else
{
ISeq s = RT.seq(sizeOrSeq);
- int size = s.count();
+ int size = RT.count(s);
long[] ret = new long[size];
for(int i = 0; i < size && s != null; i++, s = s.next())
ret[i] = ((Number) s.first()).longValue();