X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fmethod.cpp;h=337eb27bcd4e7e14339e206977677d4ca8637127;hb=4e25f6be9878154a9a7ae28917ed34427cb8ca6a;hp=a0c3a4ab233ef65d624c22556fd50eda5f6dd81f;hpb=735bdda890a385d1fa9cc532faadbbc96f2d1218;p=cacao.git diff --git a/src/vm/method.cpp b/src/vm/method.cpp index a0c3a4ab2..337eb27bc 100644 --- a/src/vm/method.cpp +++ b/src/vm/method.cpp @@ -1,6 +1,6 @@ /* src/vm/method.cpp - method functions - Copyright (C) 1996-2005, 2006, 2007, 2008 + Copyright (C) 1996-2011 CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -722,7 +722,7 @@ methodinfo *method_vftbl_lookup(vftbl_t *vftbl, methodinfo* m) m........the method of which the parameters should be counted RETURN VALUE: - The parameter count or -1 on error. + The parameter count. *******************************************************************************/ @@ -735,11 +735,7 @@ int32_t method_get_parametercount(methodinfo *m) /* is the descriptor fully parsed? */ - if (md->params == NULL) { - if (!descriptor_params_from_paramtypes(md, m->flags)) { - return -1; - } - } + descriptor_params_from_paramtypes(md, m->flags); paramcount = md->paramcount; @@ -774,9 +770,7 @@ java_handle_objectarray_t *method_get_parametertypearray(methodinfo *m) /* is the descriptor fully parsed? */ - if (m->parseddesc->params == NULL) - if (!descriptor_params_from_paramtypes(md, m->flags)) - return NULL; + descriptor_params_from_paramtypes(md, m->flags); paramtypes = md->paramtypes; paramcount = md->paramcount;