Fix NPE in DeferredHitInfoFlush when Jetty request is recycled

framework/src/main/groovy/org/moqui/impl/context/ContextJavaUtil.java

@@ -268,7 +268,7 @@ EntityValue makeAhiValue(ExecutionContextFactoryImpl ecfi) {
                 StringBuilder ps = new StringBuilder();
                 for (Map.Entry<String, Object> pme: parameters.entrySet()) {
                     Object value = pme.getValue();
-                    if (value == null || ObjectUtilities.isEmpty(value) || value instanceof Map || value instanceof Collection) continue;
+                    if (value == null || value instanceof Map || value instanceof Collection || ObjectUtilities.isEmpty(value)) continue;
                     String key = pme.getKey();
                     if (key != null && key.contains("password")) continue;
                     if (ps.length() > 0) ps.append(", ");

framework/src/main/java/org/moqui/util/WebUtilities.java

@@ -450,7 +450,15 @@ default List<String> getAttributeNameList() {
     public static class ServletRequestContainer implements AttributeContainer {
         ServletRequest req;
         public ServletRequestContainer(ServletRequest request) { req = request; }
-        @Override public Enumeration<String> getAttributeNames() { return req.getAttributeNames(); }
+        @Override public Enumeration<String> getAttributeNames() {
+            try {
+                return req.getAttributeNames();
+            } catch (NullPointerException e) {
+                // Jetty EE11 recycles the underlying request object after completion; guard against background thread access
+                logger.warn("Tried getAttributeNames() on recycled request: " + e.toString());
+                return emptyStringEnum;
+            }
+        }
         @Override public Object getAttribute(String name) { return req.getAttribute(name); }
         @Override public void setAttribute(String name, Object value) {
             if (!testSerialization(name, value)) return;