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/02/22 17:27:24 UTC

svn commit: r379808 - /incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java

Author: gnodet
Date: Wed Feb 22 08:27:21 2006
New Revision: 379808

URL: http://svn.apache.org/viewcvs?rev=379808&view=rev
Log:
Fix NPE in DeliveryChannelImpl.traceMessageExchange

Modified:
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java?rev=379808&r1=379807&r2=379808&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java Wed Feb 22 08:27:21 2006
@@ -280,26 +280,30 @@
             sb.append("  id: ").append(me.getExchangeId()).append('\n');
             sb.append("  status: ").append(me.getStatus()).append('\n');
             if (me.getMessage("in") != null) {
-                Node node = new SourceTransformer().toDOMNode(me.getMessage("in").getContent());
-                me.getMessage("in").setContent(new DOMSource(node));
-                String str = DOMUtil.asXML(node);
                 sb.append("  in: ");
-                if (str.length() > 150) {
-                    sb.append(str.substring(0, 150)).append("...");
-                } else {
-                    sb.append(str);
+                if (me.getMessage("in").getContent() != null) {
+                    Node node = new SourceTransformer().toDOMNode(me.getMessage("in").getContent());
+                    me.getMessage("in").setContent(new DOMSource(node));
+                    String str = DOMUtil.asXML(node);
+                    if (str.length() > 150) {
+                        sb.append(str.substring(0, 150)).append("...");
+                    } else {
+                        sb.append(str);
+                    }
                 }
                 sb.append('\n');
             }
             if (me.getMessage("out") != null) {
-                Node node = new SourceTransformer().toDOMNode(me.getMessage("out").getContent());
-                me.getMessage("out").setContent(new DOMSource(node));
-                String str = DOMUtil.asXML(node);
                 sb.append("  out: ");
-                if (str.length() > 150) {
-                    sb.append(str.substring(0, 150)).append("...");
-                } else {
-                    sb.append(str);
+                if (me.getMessage("out").getContent() != null) {
+                    Node node = new SourceTransformer().toDOMNode(me.getMessage("out").getContent());
+                    me.getMessage("out").setContent(new DOMSource(node));
+                    String str = DOMUtil.asXML(node);
+                    if (str.length() > 150) {
+                        sb.append(str.substring(0, 150)).append("...");
+                    } else {
+                        sb.append(str);
+                    }
                 }
                 sb.append('\n');
             }