X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Flinker.cpp;h=b1bd60a427ca66815990cf6269939f03395e75be;hb=8c6bb03b79a31fcdb02e2331a91a928d558c2845;hp=50639b736310468fe801800ded6d5af43b443748;hpb=cce34f898a508bde05c54be7f19c0fbfeb2dc0a2;p=cacao.git

diff --git a/src/vm/linker.cpp b/src/vm/linker.cpp
index 50639b736..b1bd60a42 100644
--- a/src/vm/linker.cpp
+++ b/src/vm/linker.cpp
@@ -30,14 +30,14 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 
 #include "threads/lock.hpp"
 #include "threads/mutex.hpp"
 
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
 
 #include "vm/access.hpp"
 #include "vm/array.hpp"
@@ -1108,8 +1108,8 @@ static arraydescriptor *link_array(classinfo *c)
 			desc->elementvftbl = compvftbl->arraydesc->elementvftbl;
 
 			if (compvftbl->arraydesc->dimension >= 255) {
-				log_text("Creating array of dimension >255");
-				assert(0);
+				exceptions_throw_illegalargumentexception();
+				return NULL;
 			}
 
 			desc->dimension = compvftbl->arraydesc->dimension + 1;