Cover case where cid is empty

weld · Feb 25, 2020 · 8d4fb65 · 8d4fb65
1 parent 6b6d640
commit 8d4fb65
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...src/main/java/org/jboss/weld/module/web/context/http/LazyHttpConversationContextImpl.java b/...src/main/java/org/jboss/weld/module/web/context/http/LazyHttpConversationContextImpl.java
@@ -125,7 +125,7 @@ protected void checkContextInitialized() {
                 throw e;
             }
             // new conversation, fire init event
-            if (cid == null) { // transient conversation
+            if (cid == null || cid.isEmpty()) { // transient conversation
                 fireInitEvent(request);
             }
         }

diff --git a/...a/org/jboss/weld/tests/contexts/conversation/nonexistant/NonExistentConversationTest.java b/...a/org/jboss/weld/tests/contexts/conversation/nonexistant/NonExistentConversationTest.java
@@ -79,5 +79,12 @@ public void testInitEventFired() throws IOException {
         destroyedPage = client.getPage(url + "destroyed");
         assertTrue(initPage.getContent().contains("init: 2"));
         assertTrue(destroyedPage.getContent().contains("destroyed: 2"));
+
+        // get non-existing conversation wtih empty cid
+        client.getPage(url + "begin?cid=");
+        initPage = client.getPage(url + "init");
+        destroyedPage = client.getPage(url + "destroyed");
+        assertTrue(initPage.getContent().contains("init: 3"));
+        assertTrue(destroyedPage.getContent().contains("destroyed: 3"));
     }
 }