From c65c3f22f655c97c7d37086b67148fb73ddbe08d Mon Sep 17 00:00:00 2001
From: Tucker Siegel <tgsiegel@terpmail.umd.edu>
Date: Thu, 30 Mar 2023 16:55:12 -0400
Subject: [PATCH] update

---
 .../umd/dawn/common/interceptor/RequestInterceptor.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java b/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java
index e4ce295..3040313 100644
--- a/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java
+++ b/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java
@@ -65,8 +65,12 @@ public class RequestInterceptor implements HandlerInterceptor {
             }
         }
 
-        Map<String, String> pathParams = (Map<String, String>)request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-        pathParams.forEach((k, v) -> parameters.merge(k, v, String::concat));
+        Object p = request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+
+        if (p != null) {
+            Map<String, String> pathParams = (Map<String, String>)p;
+            pathParams.forEach((k, v) -> parameters.merge(k, v, String::concat));
+        }
 
         return parameters;
     }
-- 
GitLab