You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ja...@apache.org on 2008/06/02 22:29:36 UTC

svn commit: r662550 - /geronimo/gshell/trunk/gshell-support/gshell-expr/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java

Author: jawarner
Date: Mon Jun  2 13:29:36 2008
New Revision: 662550

URL: http://svn.apache.org/viewvc?rev=662550&view=rev
Log:
GSHELL-112: Can not evaluate a variable followed by a quotation mark

Modified:
    geronimo/gshell/trunk/gshell-support/gshell-expr/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java

Modified: geronimo/gshell/trunk/gshell-support/gshell-expr/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-expr/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java?rev=662550&r1=662549&r2=662550&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-expr/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-expr/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java Mon Jun  2 13:29:36 2008
@@ -124,11 +124,15 @@
             else {
                 end = input.indexOf(" ", start);
                 if (end == -1) {
-                    end = input.indexOf("\t", start);
-
-                    if (end == -1) {
-                        end = input.length();
-                    }
+                	end = input.indexOf("\"", start);
+                	
+                	if (end == -1) {
+                        end = input.indexOf("\t", start);
+
+                        if (end == -1) {
+                            end = input.length();
+                        }
+                	}
                 }
             }