Author: dims Date: Thu Jun 7 11:55:55 2007 New Revision: 545269 URL: http://svn.apache.org/viewvc?view=rev&rev=545269 Log: switching to the patch from jarek (AXIS2-2783), basically if the value is set to null, it should stay null
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=545269&r1=545268&r2=545269 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Thu Jun 7 11:55:55 2007 @@ -2311,9 +2311,9 @@ // does exists means there are two or more operations which has the same input element (in doc/literal // this is possible. In this case better to set it as null without giving // a random operation. - Object key = messageElementQNameToOperationMap.get(messageElementQName); - if (key != null && key != operation){ - messageElementQNameToOperationMap.put(messageElementQName,null); + if (messageElementQNameToOperationMap.containsKey(messageElementQName) && + messageElementQNameToOperationMap.get(messageElementQName) != operation){ + messageElementQNameToOperationMap.put(messageElementQName, null); } else { messageElementQNameToOperationMap.put(messageElementQName, operation); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]