Author: ssmiweve
Date: 2008-05-15 14:06:05 +0200 (Thu, 15 May 2008)
New Revision: 6626
Modified:
branches/2.17/site-spi/src/main/java/no/sesat/search/site/Site.java
Log:
fix relating to comment in SKER4656 from AndersB:
java.lang.AssertionError: Parent must exist for all Sites except the DEFAULT
at no.sesat.search.site.Site.<init>(Site.java:189)
at no.sesat.search.site.Site.valueOf(Site.java:297)
at no.sesat.search.site.Site.<init>(Site.java:184)
at no.sesat.search.site.Site.valueOf(Site.java:297)
at no.sesat.search.site.Site.<init>(Site.java:184)
at no.sesat.search.site.Site.valueOf(Site.java:297)
at
no.sesat.search.http.filters.SiteLocatorFilter.getSite(SiteLocatorFilter.java:329)
at
no.sesat.search.http.filters.SiteLocatorFilter.doBeforeProcessing(SiteLocatorFilter.java:440)
Modified: branches/2.17/site-spi/src/main/java/no/sesat/search/site/Site.java
===================================================================
--- branches/2.17/site-spi/src/main/java/no/sesat/search/site/Site.java
2008-05-14 13:02:32 UTC (rev 6625)
+++ branches/2.17/site-spi/src/main/java/no/sesat/search/site/Site.java
2008-05-15 12:06:05 UTC (rev 6626)
@@ -186,7 +186,8 @@
: Site.valueOf(cxt, parentSiteName, theLocale);
}
- assert null != parent || constructingDefault : "Parent must exist
for all Sites except the DEFAULT";
+ assert null != parent || constructingDefault ||
DEFAULT.getName().equals(cxtName)
+ : "Parent must exist for all Sites except the DEFAULT";
// register in global pool.
LOG.debug("INSTANCES.put(" + uniqueName + ", this)");
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
