Author: mickw Date: 2006-04-03 14:16:31 +0200 (Mon, 03 Apr 2006) New Revision: 2697
Modified: trunk/develop.properties trunk/src/java/no/schibstedsok/front/searchportal/site/Site.java Log: meet contract of getConfigContext() Modified: trunk/develop.properties =================================================================== --- trunk/develop.properties 2006-04-03 11:46:53 UTC (rev 2696) +++ trunk/develop.properties 2006-04-03 12:16:31 UTC (rev 2697) @@ -1,6 +1,6 @@ # Default Site. See no.schibstedsok.front.searchportal.site.Site.java # Needs to match search-html-config/XXX.properties -sesam.site.default=localhost:8080/ +sesam.site.default=localhost:8080 # Fast Query queryServerURL.1=http://localhost:15100 Modified: trunk/src/java/no/schibstedsok/front/searchportal/site/Site.java =================================================================== --- trunk/src/java/no/schibstedsok/front/searchportal/site/Site.java 2006-04-03 11:46:53 UTC (rev 2696) +++ trunk/src/java/no/schibstedsok/front/searchportal/site/Site.java 2006-04-03 12:16:31 UTC (rev 2697) @@ -63,20 +63,17 @@ */ private final String uniqueName; - - - /** Creates a new instance of Site. */ - private Site(final String siteName, final Locale locale) { + private Site(final String _siteName, final Locale _locale) { // siteName must finish with a '\' - this.siteName = siteName.endsWith("/") - ? siteName - : siteName + '/'; - this.cxtName = siteName.indexOf(':') >= 0 - ? siteName.substring(0, siteName.indexOf(':')) + "/" // don't include the port in the cxtName. + siteName = _siteName.endsWith("/") + ? _siteName + : _siteName + '/'; + cxtName = siteName.indexOf(':') >= 0 + ? siteName.substring(0, siteName.indexOf(':')) + '/' // don't include the port in the cxtName. : siteName; - this.locale = locale; + locale = _locale; uniqueName = getUniqueName(siteName, locale); // register in global pool. INSTANCES.put(uniqueName, this); _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
