Author: rfeng
Date: Tue Jun 24 21:54:06 2008
New Revision: 671426
URL: http://svn.apache.org/viewvc?rev=671426&view=rev
Log:
Fix NPE when the conversationID==null
Modified:
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
Modified:
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java?rev=671426&r1=671425&r2=671426&view=diff
==============================================================================
---
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
(original)
+++
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
Tue Jun 24 21:54:06 2008
@@ -146,7 +146,8 @@
* @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);
}
/**
