diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-25 04:54:06 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-25 04:54:06 +0000 |
| commit | f8f9abd4005d275bf6591c03ce9deb52d6cfe737 (patch) | |
| tree | fd3292596caddfb3018539ad3b69541b27aae4fc /java/sca/modules/core/src/main | |
| parent | 2d2b8566f0c1cc56be186d886ee985a58dfa2a02 (diff) | |
Fix NPE when the conversationID==null
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@671426 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/core/src/main')
| -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); } /** |