[jboss-svn-commits] JBL Code SVN: r8313 - in labs/jbossesb/trunk/product/core: listeners/src/org/jboss/soa/esb/listeners rosetta/src/org/jboss/soa/esb/couriers

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

Author: estebanschifman
Date: 2006-12-14 06:51:15 -0500 (Thu, 14 Dec 2006)
New Revision: 8313

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
Log:
Remove kludge to add message ID in CourierUtil.messageFromLocalFile()

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java	2006-12-14 10:54:17 UTC (rev 8312)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java	2006-12-14 11:51:15 UTC (rev 8313)
@@ -14,7 +14,7 @@
 	 * until controlled listeners are up and running
 	 * <br/> if false, will instantiate and run the Controller in current thread - flow control will only
 	 * return to invoker once the controller's run() method has finished
-	 * @return
+	 * @return ListenerManager
 	 * @throws Exception
 	 */
 	public static ListenerManager launchManager(String parametersName, boolean inNewThread)

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java	2006-12-14 10:54:17 UTC (rev 8312)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java	2006-12-14 11:51:15 UTC (rev 8313)
@@ -162,23 +162,23 @@
 		{
 			reader = new FileInputStream(from);
 			serial = (Serializable) new ObjectInputStream(reader).readObject();
-			Message msg = Util.deserialize(serial);
+			return Util.deserialize(serial);
+			/*
 			URI msgId = msg.getHeader().getCall().getMessageID();
 			if (null == msgId || Util.isNullString(msgId.toString()))
 			{
-				// TODO this should not happen - Serialization/Deserialization
-				// perhaps ??
+				// this should not happen - Serialization/Deserialization perhaps ??
 				String sId = from.getName();
 				int iDot = sId.indexOf(".");
 				URI fileUri = new URI((iDot < 0) ? sId : sId.substring(0, iDot));
 				msg.getHeader().getCall().setMessageID(fileUri);
 			}
 			return msg;
+			*/
 		}
 		catch (Exception e)
 		{
-			e.printStackTrace();
-			
+			_logger.debug(e);
 			throw new CourierException(e);
 		}
 		finally