Author: mfortun Date: 2011-05-17 17:34:30 +0200 (Tue, 17 May 2011) New Revision: 901 Url: http://nuiton.org/repositories/revision/wikitty/901 Log: * correct copy/past mistake in initialization for fallback service Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-17 14:20:57 UTC (rev 900) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-17 15:34:30 UTC (rev 901) @@ -32,11 +32,6 @@ public static String WIKITTY_SERVICE_FALLBACK_COMPONNENT_KEY; public static String WIKITTY_SERVICE_FALLBACK_URL_KEY; - /* - * TODO mfortun-2011-05-13 multicontext the begginning, need to think about - * how invoke method in the different proxy properly. - */ - /** * */ @@ -69,7 +64,7 @@ WikittyService ws = getWikittyService(config); ApplicationConfig configFallBack = WikittyPublicationConfig - .getInstance(); + .getFallBackConfig(); WikittyService fallservice = getWikittyServiceFallBack(configFallBack); WikittyPublicationProxy result = new WikittyPublicationProxy(config, @@ -1060,12 +1055,8 @@ List<String> result = mainProxy.findIdByCriteria(criteria); - // TODO mfortun-2011-05-17 reform criteria + if (isFallbackService()) { - if (isFallbackService()) { - - - if (result == null) { result = fallbackProxy.findIdByCriteria(criteria); } else { @@ -1463,6 +1454,15 @@ return result; } + /** + * Create a criteria to exclude a list of if from a criteria + * + * @param origin + * the criteria from whom exclude id + * @param toExclude + * list of id to exlude + * @return the criteria excluding ids + */ protected Criteria idNotInCriteriaConstructor(Criteria origin, List<String> toExclude) { Criteria result = null; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-17 14:20:57 UTC (rev 900) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-17 15:34:30 UTC (rev 901) @@ -25,7 +25,7 @@ protected WikittyUser user; public WikittyPublicationSession() { - proxy = WikittyPublicationProxy.getInstance(null); + proxy = WikittyPublicationProxy.getInstanceWithFallback(null); } /**