Author: ssmiweve
Date: 2008-03-12 21:14:47 +0100 (Wed, 12 Mar 2008)
New Revision: 6252
Modified:
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
branches/2.16.0/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
Log:
SEARCH-4364 - Unique ID confusion
Modified:
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-12 11:49:47 UTC (rev 6251)
+++
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-12 20:14:47 UTC (rev 6252)
@@ -225,6 +225,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.0/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
===================================================================
---
branches/2.16.0/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
2008-03-12 11:49:47 UTC (rev 6251)
+++
branches/2.16.0/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
2008-03-12 20:14:47 UTC (rev 6252)
@@ -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)
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
