From 8ae75e57df346929beb7a661c167386677df30cc Mon Sep 17 00:00:00 2001
From: gmantele <gmantele@ari.uni-heidelberg.de>
Date: Wed, 13 Jan 2016 15:07:00 +0100
Subject: [PATCH] [TAP,UWS] Fix the setting of the request ID: before
 correction, the HTTP request ID set by the TAP library was replaced by the
 one of the TAP library. The consequence was a possible bad logging and since
 the ID is a timestamp, the ID of the request was indicating a time posterior
 to a job creation.

---
 src/uws/service/UWSService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/uws/service/UWSService.java b/src/uws/service/UWSService.java
index 2cfac56..8622bde 100644
--- a/src/uws/service/UWSService.java
+++ b/src/uws/service/UWSService.java
@@ -16,7 +16,7 @@ package uws.service;
  * You should have received a copy of the GNU Lesser General Public License
  * along with UWSLibrary.  If not, see <http://www.gnu.org/licenses/>.
  * 
- * Copyright 2012-2015 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
+ * Copyright 2012-2016 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
  *                       Astronomisches Rechen Institut (ARI)
  */
 
@@ -137,7 +137,7 @@ import uws.service.request.RequestParser;
  * </p>
  * 
  * @author Gr&eacute;gory Mantelet (CDS;ARI)
- * @version 4.1 (04/2015)
+ * @version 4.2 (01/2016)
  */
 public class UWSService implements UWS {
 
@@ -1044,7 +1044,7 @@ public class UWSService implements UWS {
 			return false;
 
 		// Generate a unique ID for this request execution (for log purpose only):
-		final String reqID = generateRequestID(request);
+		final String reqID = (request.getAttribute(UWS.REQ_ATTRIBUTE_ID) == null ? generateRequestID(request) : request.getAttribute(UWS.REQ_ATTRIBUTE_ID).toString());
 		if (request.getAttribute(UWS.REQ_ATTRIBUTE_ID) == null)
 			request.setAttribute(UWS.REQ_ATTRIBUTE_ID, reqID);
 
-- 
GitLab