Changeset 21610 in osm for applications/editors/josm/plugins/graphview

Timestamp:

2010-06-07T23:33:24+02:00 (14 years ago)

Author:

tordanik

Message:

prevent stack overflows; closes bug 4695 in JOSM Trac

File:

• applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java (modified) (2 diffs)

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java

@@ -73 +73 @@
                 }
         }
-        
+
         public Object getMember(RelationMember member) {
                 return member.getMember();
         }
-        
+
         public String getRole(RelationMember member) {
                 return member.getRole();
         }
-        
+
         public boolean isNMember(RelationMember member) {
                 return member.getMember() instanceof Node;
         }
-        
+
         public boolean isWMember(RelationMember member) {
                 return member.getMember() instanceof Way;
         }
-        
+
         public boolean isRMember(RelationMember member) {
                 return member.getMember() instanceof Relation;
         }
-        
+
 
         private static final TagGroup EMPTY_TAG_GROUP;
@@ -150 +150 @@
 
                         private void updateNext() {
-                                if (originalIterator.hasNext()) {
-                                        next = originalIterator.next();
-                                        if (!accept(next)) {
-                                                updateNext();
+                                next = null;
+                                while (originalIterator.hasNext()) {
+                                        P originalNext = originalIterator.next();
+                                        if (accept(originalNext)) {
+                                                next = originalNext;
+                                                break;
                                         }
-                                } else {
-                                        next = null;
                                 }
                         }