[jboss-svn-commits] JBL Code SVN: r15694 - in labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format: xml and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: mark.little at jboss.com
Date: 2007-10-09 16:14:54 -0400 (Tue, 09 Oct 2007)
New Revision: 15694

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/ContextImpl.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/FaultImpl.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1150

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/ContextImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/ContextImpl.java	2007-10-09 20:02:04 UTC (rev 15693)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/ContextImpl.java	2007-10-09 20:14:54 UTC (rev 15694)
@@ -29,6 +29,6 @@
 	
 	public String toString ()
 	{
-		return "context: [ null ]";
+		return "context: [  ]";
 	}
 }
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/FaultImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/FaultImpl.java	2007-10-09 20:02:04 UTC (rev 15693)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/FaultImpl.java	2007-10-09 20:14:54 UTC (rev 15694)
@@ -91,9 +91,12 @@
 		String reason = getReason();
 		Throwable cause = getCause();
 		
-		return "fault: [ "+((code != null) ? code : "null")+", "+((reason != null) ? reason : "null")+", "+((cause != null) ? cause : "null")+" ]";
+		if ((code == null) && (reason == null) && (cause == null))
+			return "fault: [  ]";
+		else
+			return "fault: [ "+((code != null) ? code : "null")+", "+((reason != null) ? reason : "null")+", "+((cause != null) ? cause : "null")+" ]";
 	}
-	
+
 	public void writeExternal (ObjectOutput out) throws IOException
 	{
 		// no need to do anything

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java	2007-10-09 20:02:04 UTC (rev 15693)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java	2007-10-09 20:14:54 UTC (rev 15694)
@@ -78,7 +78,7 @@
 		if (_call != null)
 			return "header: [ "+_call.toString()+" ]";
 		else
-			return "header: [ null ]";
+			return "header: [  ]";
 	}
 	
 	/*

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java	2007-10-09 20:02:04 UTC (rev 15693)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java	2007-10-09 20:14:54 UTC (rev 15694)
@@ -33,7 +33,7 @@
     
 	public String toString ()
 	{
-		return "context: [ null ]";
+		return "context: [  ]";
 	}
 	
 	public Element toXML (Element envelope) throws MarshalException

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java	2007-10-09 20:02:04 UTC (rev 15693)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java	2007-10-09 20:14:54 UTC (rev 15694)
@@ -83,7 +83,10 @@
 		String reason = getReason();
 		Throwable cause = getCause();
 		
-		return "fault: [ "+((code != null) ? code : "null")+", "+((reason != null) ? reason : "null")+", "+((cause != null) ? cause : "null")+" ]";
+		if ((code == null) && (reason == null) && (cause == null))
+			return "fault: [  ]";
+		else
+			return "fault: [ "+((code != null) ? code : "null")+", "+((reason != null) ? reason : "null")+", "+((cause != null) ? cause : "null")+" ]";
 	}
 	
 	public Element toXML(Element envelope) throws MarshalException

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java	2007-10-09 20:02:04 UTC (rev 15693)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java	2007-10-09 20:14:54 UTC (rev 15694)
@@ -64,7 +64,7 @@
 		if (_call != null)
 			return "header: [ "+_call.toString()+" ]";
 		else
-			return "header: [ null ]";
+			return "header: [  ]";
 	}
 	
 	public Element toXML (Element envelope) throws MarshalException