Author: ssmiweve
Date: 2008-10-19 23:34:41 +0200 (Sun, 19 Oct 2008)
New Revision: 6882
Modified:
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
trunk/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
Log:
SiteConfiguration: new Properties(properties) doesn't work well from velocity
templates
SearchTabMainTag: check for null first
Modified:
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
===================================================================
---
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
2008-10-14 15:01:06 UTC (rev 6881)
+++
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
2008-10-19 21:34:41 UTC (rev 6882)
@@ -24,6 +24,7 @@
import org.apache.log4j.Logger;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
@@ -116,11 +117,15 @@
/**
* Get all the properties. A defensive copy of the map is returned.
+ * Uses clone() as Collections.unmodifableMap(properties) gives an awkward
to use Map<Object,Object>
+ * So is a relatively expensive method to use.
+ *
* @return defensive copy of the map is returned.
*/
public Properties getProperties() {
- return new Properties(properties);
+ // new Properties(properties) does not work.
+ return (Properties) properties.clone();
}
/**
Modified:
trunk/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
===================================================================
--- trunk/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
2008-10-14 15:01:06 UTC (rev 6881)
+++ trunk/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
2008-10-19 21:34:41 UTC (rev 6882)
@@ -90,13 +90,13 @@
? front
: layout.getMain();
- include = include.startsWith("/")
- ? include
- : PAGES_DIRECTORY + include;
-
try{
if(null != include){
+ include = include.startsWith("/")
+ ? include
+ : PAGES_DIRECTORY + include;
+
final Map<String,Object> map = new HashMap<String,Object>();
map.put("layout", layout);
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
