[jboss-svn-commits] JBL Code SVN: r15695 - in labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb: util and 1 other directory.

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

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

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/Util.java
Log:
http://jira.jboss.com/jira/browse/JBESB-947

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java	2007-10-09 20:14:54 UTC (rev 15694)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java	2007-10-09 20:16:04 UTC (rev 15695)
@@ -75,6 +75,7 @@
 	 * @param selector  A valid JMS message selector
 	 * @return Properties  A Properties object containing the keys and values in the message selector
 	 * @throws ConfigurationException
+	 * @ceprecated Use Util.propertiesFromSelector
 	 */
 	public static Properties propertiesFromSelector(String selector)
 		throws ConfigurationException

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/Util.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/Util.java	2007-10-09 20:14:54 UTC (rev 15694)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/Util.java	2007-10-09 20:16:04 UTC (rev 15695)
@@ -241,19 +241,40 @@
 
 	if (!Util.isNullString(selector))
 	{
-	    for (String sCurr : selector.trim().split(" AND "))
+	    for (String sCurr : selector.trim().split("AND"))
 	    {
 		String[] sa = sCurr.split("=");
-		if (sa.length != 2 || sa[1].charAt(0) != '\''
-			|| sa[1].charAt(-1 + sa[1].length()) != '\'')
+		String attr = null;
+		String value = null;
+		boolean fail = false;
+		
+		if (sa.length == 2)
 		{
+			if (sa[1].charAt(0) != '\''
+				|| sa[1].charAt(-1 + sa[1].length()) != '\'')
+			{
+				fail = true;
+			}
+			else
+			{
+				attr = sa[0].trim();
+				value = sa[1].trim();
+			}
+		}
+		else
+			fail = true;
+		
+		if (fail)
+		{
 		    throw new IllegalArgumentException(
 			    "Illegal message selector syntax <"
 				    + selector
 				    + ">.  Must be 2 tokens seperated by an '=' character, and the token after the '=' character must be enclosed in single quotes.");
 		}
-		KeyValuePair oNew = new KeyValuePair(sa[0], sa[1].substring(0,
-			-1 + sa[1].length()).substring(1));
+		
+		// attr/value will be non-null by here.
+		KeyValuePair oNew = new KeyValuePair(attr, value.substring(0,
+			-1 + value.length()).substring(1));
 		oRet.add(oNew);
 	    }
 	}