Author: ssmiweve
Date: 2007-06-08 15:40:03 +0200 (Fri, 08 Jun 2007)
New Revision: 5294

Modified:
   
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java
Log:
SEARCH-2463 - Malformed URL on vg.sesam.no

Modified: 
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java
===================================================================
--- 
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java
       2007-06-08 11:38:22 UTC (rev 5293)
+++ 
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java
       2007-06-08 13:40:03 UTC (rev 5294)
@@ -78,7 +78,7 @@
     // Static --------------------------------------------------------
 
     /**
-     * TODO comment me. *
+     *
      * @param cxt 
      * @return 
      */
@@ -151,7 +151,7 @@
     // Public --------------------------------------------------------
 
     /**
-     * TODO comment me. *
+     *
      * @param id 
      * @return 
      */
@@ -405,7 +405,14 @@
                 final SearchConfiguration inherit,
                 final Context context) {
 
-            return construct(element, 
context).readSearchConfiguration(element, inherit);
+            final SearchConfiguration sc = construct(element, context);
+            
+            assert null == inherit || 
inherit.getClass().isAssignableFrom(sc.getClass()) 
+                    : "Can only inherit from same or superclass configuration. 
" 
+                    + element.getAttribute("id") + '(' + 
sc.getClass().getSimpleName() + ')'
+                    + " trying to inherit from " + inherit.getName() + '(' + 
inherit.getClass().getSimpleName() + ')';
+            
+            return sc.readSearchConfiguration(element, inherit);
         }
 
         @SuppressWarnings("unchecked")

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to