webwork/src/main/webwork/util Query.java,1.21,1.22

Update of /cvsroot/opensymphony/webwork/src/main/webwork/util
In directory sc8-pr-cvs1:/tmp/cvs-serv1717

Modified Files:
	Query.java 
Log Message:
Updated when adding SimpleTest class to fix issue WW-387

Index: Query.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/util/Query.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Query.java	10 Nov 2003 08:07:22 -0000	1.21
+++ Query.java	16 Nov 2003 23:35:02 -0000	1.22
@@ -18,7 +18,8 @@
  */
 public class Query {
    // Static  -------------------------------------------------------
-   static Map queries = new ConcurrentReaderHashMap();
+   protected static Map queries = new ConcurrentReaderHashMap();
+   public static final Query CURRENT = getQuery(".");
 
    /**
     * Create a new Query and cache it for faster processing;
@@ -279,7 +280,8 @@
                throwIllegalArgumentException(query, "missing matching brace");
 
             String id = new String(query, begBraceIdx + 1, endBraceIdx - (begBraceIdx + 1));
-            add(new QuerySegment(id, QuerySegment.EXPAND));
+            Query expandQuery = getQuery(id);
+            add(new QuerySegment(id, expandQuery, QuerySegment.EXPAND));
          }
          //-- Method
          else if (begParenIdx > -1) {
@@ -309,7 +311,8 @@
 
                // create the parsed parameter and add it to the query segment
                String parameter = new String(query, paramStart, (paramEnd - paramStart) + 1);
-               qs.addValue(parameter);
+               Query paramQuery = getQuery(parameter);
+               qs.addValue(paramQuery);
 
                // bump the start one past the end token position
                paramStart = paramIdxs[commaNbr] + 1;
@@ -349,7 +352,8 @@
 
             // parse out the name of the key
             String key = new String(query, begBracketIdx + 1, endBracketIdx - (begBracketIdx + 1));
-            add(new QuerySegment(key, QuerySegment.COLLECTION));
+            Query queryKey = getQuery(key);
+            add(new QuerySegment(key, queryKey, QuerySegment.COLLECTION));
          }
 
       } while (queryIdx < query.length);




-------------------------------------------------------
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl