[SM-1186] NormalizedMessageImpl.getAttachment() returns DataHandler when it should return null

• Type: Bug
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 3.2.1
• Fix Version/s: 3.2.2, 3.3
• Component/s: servicemix-core

Environment

any

• Patch Info: Patch Available
• Assignee: Lars Heinemann
• Reporter: Alex Vigdor
• Created: 27/Dec/07 23:57
• Updated: 26/Feb/08 19:17
• Resolved: 26/Feb/08 19:17

Description

The current implementation of getAttachment() in NormalizedMessageImpl always returns a DataHandler if the message has any attachments, even if it does not have an attachment with the given ID:

public DataHandler getAttachment(String id) {
if (attachments != null)

{ return new DataHandler((DataSource) attachments.get(id)); }

return null;
}

According to the JBI javadocs, getAttachment should return "DataHandler representing attachment content, or null if an attachment with the specified identifier is not found".

Thus, the implementation should add an additional check

if(attachments !=null && attachments.get(id) != null){
return new DataHandler((DataSource) attachments.get(id));
}