Author: robbie
Date: Mon Feb 6 21:04:42 2012
New Revision: 1241180
URL: http://svn.apache.org/viewvc?rev=1241180&view=rev
Log:
QPID-3801: change use of escaped single quote to a hex literal to avoid a bug
in Checkstyle after JavaCC processes it into escaped unicode. Add braces to if
statements and remove tabs for clarity.
Modified:
qpid/trunk/qpid/java/common/src/main/grammar/SelectorParser.jj
Modified: qpid/trunk/qpid/java/common/src/main/grammar/SelectorParser.jj
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/grammar/SelectorParser.jj?rev=1241180&r1=1241179&r2=1241180&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/grammar/SelectorParser.jj (original)
+++ qpid/trunk/qpid/java/common/src/main/grammar/SelectorParser.jj Mon Feb 6
21:04:42 2012
@@ -565,10 +565,12 @@ String stringLiteral() :
// Decode the sting value.
String image = t.image;
for( int i=1; i < image.length()-1; i++ ) {
- char c = image.charAt(i);
- if( c == '\'' )
- i++;
- rc.append(c);
+ char c = image.charAt(i);
+ if( c == (char) 0x27 )//single quote
+ {
+ i++;
+ }
+ rc.append(c);
}
return rc.toString();
}
@@ -594,7 +596,9 @@ PropertyExpression variable() :
for( int i=1; i < image.length()-1; i++ ) {
char c = image.charAt(i);
if( c == '"' )
+ {
i++;
+ }
rc.append(c);
}
return new PropertyExpression(rc.toString());
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
