Author: ssmiweve
Date: 2008-03-12 21:31:14 +0100 (Wed, 12 Mar 2008)
New Revision: 6254
Modified:
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
branches/2.16/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
branches/2.16/war/src/main/webapp/WEB-INF/web.xml
Log:
merge from 2.16.0 of r6152 & r6153
Modified:
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-12 20:16:58 UTC (rev 6253)
+++
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-12 20:31:14 UTC (rev 6254)
@@ -224,6 +224,7 @@
public ResultList<? extends ResultItem> call() {
MDC.put(Site.NAME_KEY, datamodel.getSite().getSite().getName());
+ MDC.put("UNIQUE_ID", datamodel.getParameters().getUniqueId());
thread = Thread.currentThread();
final String t = thread.getName();
Modified:
branches/2.16/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
===================================================================
---
branches/2.16/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
2008-03-12 20:16:58 UTC (rev 6253)
+++
branches/2.16/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
2008-03-12 20:31:14 UTC (rev 6254)
@@ -405,9 +405,10 @@
static String getRequestId(final ServletRequest servletRequest){
- return null != servletRequest.getAttribute("UNIQUE_ID")
- ? (String)servletRequest.getAttribute("UNIQUE_ID")
- : UUID.randomUUID().toString();
+ if(null == servletRequest.getAttribute("UNIQUE_ID")){
+ servletRequest.setAttribute("UNIQUE_ID",
UUID.randomUUID().toString());
+ }
+ return (String)servletRequest.getAttribute("UNIQUE_ID");
}
private void doBeforeProcessing(final ServletRequest request, final
ServletResponse response)
Modified: branches/2.16/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/2.16/war/src/main/webapp/WEB-INF/web.xml 2008-03-12 20:16:58 UTC
(rev 6253)
+++ branches/2.16/war/src/main/webapp/WEB-INF/web.xml 2008-03-12 20:31:14 UTC
(rev 6254)
@@ -50,7 +50,7 @@
<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
</filter>
- <filter>
+ <filter> <!-- TODO desparately needs sesat-ising. fortunately it's not a
required secret anymore. SEARCH-4366 -->
<filter-name>md5ProtectParameters</filter-name>
<filter-class>no.sesat.search.http.filters.MD5ProtectedParametersFilter</filter-class>
<init-param>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
