From 1308142f2d051c458c57a82dc666bba593bb79c6 Mon Sep 17 00:00:00 2001
From: gmantele <gmantele@ari.uni-heidelberg.de>
Date: Wed, 8 Apr 2015 18:51:13 +0200
Subject: [PATCH] [UWS,TAP] Fix regression: the log message for the event
 REQUEST_RECEIVED was not displayed any more.

---
 src/uws/service/log/DefaultUWSLog.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/uws/service/log/DefaultUWSLog.java b/src/uws/service/log/DefaultUWSLog.java
index dd03f8f..a4e0129 100644
--- a/src/uws/service/log/DefaultUWSLog.java
+++ b/src/uws/service/log/DefaultUWSLog.java
@@ -463,7 +463,7 @@ public class DefaultUWSLog implements UWSLog {
 			str.append(')');
 
 			// Send the log message to the log file:
-			log(level, "HTTP", "REQUEST_RECEIVED", requestId, message, str.toString(), error);
+			log(level, "HTTP", "REQUEST_RECEIVED", requestId, (message != null ? message : str.toString()), (message != null ? str.toString() : null), error);
 		}
 		// OTHERWISE, just write the given message:
 		else
-- 
GitLab