You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/08/23 23:05:58 UTC
svn commit: r434178 -
/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeImpl.java
Author: gnodet
Date: Wed Aug 23 14:05:58 2006
New Revision: 434178
URL: http://svn.apache.org/viewvc?rev=434178&view=rev
Log:
Fix possible NPE, thx to Robert H. Pollack
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeImpl.java
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeImpl.java?rev=434178&r1=434177&r2=434178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeImpl.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeImpl.java Wed Aug 23 14:05:58 2006
@@ -719,10 +719,10 @@
if (getMessage(msg) != null) {
sb.append(" ").append(msg).append(": ");
try {
- if (preserveContent) {
- sb.append(getMessage(msg).getContent().getClass());
- } else {
- if (getMessage(msg).getContent() != null) {
+ if (getMessage(msg).getContent() != null) {
+ if (preserveContent) {
+ sb.append(getMessage(msg).getContent().getClass());
+ } else {
Node node = st.toDOMNode(getMessage(msg).getContent());
getMessage(msg).setContent(new DOMSource(node));
String str = st.toString(node);
@@ -732,6 +732,8 @@
sb.append(str);
}
}
+ } else {
+ sb.append("null");
}
} catch (Exception e) {
sb.append("Unable to display: ").append(e);