diff options
| -rw-r--r-- | java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java index 0aa9430666..8a883f8e15 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java @@ -146,7 +146,8 @@ public class ConversationManagerImpl implements ConversationManager { * @see org.apache.tuscany.sca.core.conversation.ConversationManager#getConversation(java.lang.Object) */ public ExtendedConversation getConversation(Object conversationID) { - return conversations.get(conversationID); + // ConcurrentHashMap cannot take null key + return conversationID == null ? null : conversations.get(conversationID); } /** |