Author: bpoussin Date: 2012-06-02 05:31:35 +0200 (Sat, 02 Jun 2012) New Revision: 1484 Url: http://nuiton.org/repositories/revision/wikitty/1484 Log: si pas de resultat apres une recherche de noeud, il ne faut pas essayer de reconstruire l'arbre pour le retourner Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-06-02 03:07:04 UTC (rev 1483) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-06-02 03:31:35 UTC (rev 1484) @@ -1056,21 +1056,24 @@ WikittyQueryResultTreeNode<String> resultId = wikittyService.findTreeNode( securityToken, wikittyId, depth, count, filter); - RetrieveIdVisitor retrieveIdVisitor = new RetrieveIdVisitor(); - resultId.acceptVisitor(retrieveIdVisitor); + WikittyQueryResultTreeNode<Wikitty> result = null; + if (resultId != null) { + RetrieveIdVisitor retrieveIdVisitor = new RetrieveIdVisitor(); + resultId.acceptVisitor(retrieveIdVisitor); - List<String> ids = retrieveIdVisitor.getIds(); - List<Wikitty> wikitties = restore(ids); - - IdToObjectConverter<Wikitty> converter = - new IdToObjectConverter<Wikitty>(ids, wikitties); + List<String> ids = retrieveIdVisitor.getIds(); + List<Wikitty> wikitties = restore(ids); - ConvertTreeVisitor<Wikitty> convertVisitor = - new ConvertTreeVisitor<Wikitty>(converter); + IdToObjectConverter<Wikitty> converter = + new IdToObjectConverter<Wikitty>(ids, wikitties); - resultId.acceptVisitor(convertVisitor); + ConvertTreeVisitor<Wikitty> convertVisitor = + new ConvertTreeVisitor<Wikitty>(converter); - WikittyQueryResultTreeNode<Wikitty> result = convertVisitor.getTree(); + resultId.acceptVisitor(convertVisitor); + + result = convertVisitor.getTree(); + } timeLog.log(start, "findTreeNode<Wikitty>"); return result; } @@ -1099,21 +1102,24 @@ WikittyQueryResultTreeNode<String> resultId = wikittyService.findTreeNode( securityToken, wikittyId, depth, count, filter); - RetrieveIdVisitor retrieveIdVisitor = new RetrieveIdVisitor(); - resultId.acceptVisitor(retrieveIdVisitor); + WikittyQueryResultTreeNode<E> result = null; + if (resultId != null) { + RetrieveIdVisitor retrieveIdVisitor = new RetrieveIdVisitor(); + resultId.acceptVisitor(retrieveIdVisitor); - List<String> ids = retrieveIdVisitor.getIds(); - List<E> wikitties = restore(clazz, ids); + List<String> ids = retrieveIdVisitor.getIds(); + List<E> wikitties = restore(clazz, ids); - IdToObjectConverter<E> converter = - new IdToObjectConverter<E>(ids, wikitties); + IdToObjectConverter<E> converter = + new IdToObjectConverter<E>(ids, wikitties); - ConvertTreeVisitor<E> convertVisitor = - new ConvertTreeVisitor<E>(converter); + ConvertTreeVisitor<E> convertVisitor = + new ConvertTreeVisitor<E>(converter); - resultId.acceptVisitor(convertVisitor); + resultId.acceptVisitor(convertVisitor); - WikittyQueryResultTreeNode<E> result = convertVisitor.getTree(); + result = convertVisitor.getTree(); + } timeLog.log(start, "findTreeNode"); return result; }