>From 721f6ad6eed965afb940158c25826a4c997cc74b Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nos...@gmail.com>
Date: Thu, 25 Jun 2009 18:14:30 +0200
Subject: [PATCH] vm/classloader: stop searching once we've found the class

If we don't break out of that loop, the next iteration (if there are
more -cp arguments) will erase the previous result.

Reported-by: Tomek Grabiec <tgrab...@gmail.com>
Signed-off-by: Vegard Nossum <vegard.nos...@gmail.com>
---
 vm/classloader.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/vm/classloader.c b/vm/classloader.c
index 24d107e..6b67c20 100644
--- a/vm/classloader.c
+++ b/vm/classloader.c
@@ -388,8 +388,11 @@ struct vm_class *load_class(const char *class_name)
                goto out_filename;
 
        struct classpath *cp;
-       list_for_each_entry(cp, &classpaths, node)
+       list_for_each_entry(cp, &classpaths, node) {
                result = load_class_from_classpath_file(cp->paths, filename);
+               if (result)
+                       break;
+       }
 
 out_filename:
        free(filename);
-- 
1.6.0.4


------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel

Reply via email to