[jboss-cvs] jboss-seam/src/main/org/jboss/seam/framework ...

[Gavin King]

  User: gavin   
  Date: 07/02/26 13:13:05

  Modified:    src/main/org/jboss/seam/framework  Query.java
  Log:
  nicer errors
  
  Revision  Changes    Path
  1.21      +14 -1     jboss-seam/src/main/org/jboss/seam/framework/Query.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Query.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/Query.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- Query.java	25 Feb 2007 19:06:23 -0000	1.20
  +++ Query.java	26 Feb 2007 18:13:05 -0000	1.21
  @@ -165,7 +165,20 @@
                  String token = tokens.nextToken();
                  if ( "#".equals(token) )
                  {
  -                  String expression = token + tokens.nextToken() + tokens.nextToken();
  +                  if ( !tokens.hasMoreTokens() )
  +                  {
  +                     throw new IllegalArgumentException("restriction terminates in #");
  +                  }
  +                  String expressionToken = tokens.nextToken();
  +                  if ( !expressionToken.startsWith("{") )
  +                  {
  +                     throw new IllegalArgumentException("missing { after # in restriction");
  +                  }
  +                  if ( !tokens.hasMoreTokens() )
  +                  {
  +                     throw new IllegalArgumentException("missing } after expression in restriction");
  +                  }
  +                  String expression = token + expressionToken + tokens.nextToken();
                     valueBinding = Expressions.instance().createValueBinding(expression);
                     builder.append(":p").append( queryParameters.size() + restrictionParameters.size() );
                  }