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 21:26:30 UTC
svn commit: r434130 -
/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeImpl.java
Author: gnodet
Date: Wed Aug 23 12:26:29 2006
New Revision: 434130
URL: http://svn.apache.org/viewvc?rev=434130&view=rev
Log:
SM-553: add a system property to preserve jbi message content when calling toString() and avoid returning null when an exception is thrown
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=434130&r1=434129&r2=434130&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 12:26:29 2006
@@ -707,24 +707,30 @@
return sb.toString();
} catch (Exception e) {
log.trace("Error caught in toString", e);
- return null;
+ return super.toString();
}
}
-
+
public static final int maxMsgDisplaySize = 1500;
-
+
+ public static final boolean preserveContent = Boolean.getBoolean("org.apache.servicemix.preserveContent");
+
private void display(String msg, StringBuffer sb, SourceTransformer st) {
if (getMessage(msg) != null) {
sb.append(" ").append(msg).append(": ");
try {
- if (getMessage(msg).getContent() != null) {
- Node node = st.toDOMNode(getMessage(msg).getContent());
- getMessage(msg).setContent(new DOMSource(node));
- String str = st.toString(node);
- if (str.length() > maxMsgDisplaySize) {
- sb.append(str.substring(0, maxMsgDisplaySize)).append("...");
- } else {
- sb.append(str);
+ if (preserveContent) {
+ sb.append(getMessage(msg).getContent().getClass());
+ } else {
+ if (getMessage(msg).getContent() != null) {
+ Node node = st.toDOMNode(getMessage(msg).getContent());
+ getMessage(msg).setContent(new DOMSource(node));
+ String str = st.toString(node);
+ if (str.length() > maxMsgDisplaySize) {
+ sb.append(str.substring(0, maxMsgDisplaySize)).append("...");
+ } else {
+ sb.append(str);
+ }
}
}
} catch (Exception e) {
@@ -733,5 +739,5 @@
sb.append('\n');
}
}
-
+
}