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

[Gavin King]

  User: gavin   
  Date: 06/12/16 09:06:58

  Modified:    src/main/org/jboss/seam/framework    EntityQuery.java
                        HibernateEntityQuery.java Query.java
  Log:
  better handling of empty string
  JBSEAM-570, @Observer(create=false)
  
  Revision  Changes    Path
  1.7       +1 -1      jboss-seam/src/main/org/jboss/seam/framework/EntityQuery.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityQuery.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/EntityQuery.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- EntityQuery.java	14 Dec 2006 08:37:49 -0000	1.6
  +++ EntityQuery.java	16 Dec 2006 14:06:58 -0000	1.7
  @@ -128,7 +128,7 @@
         for (int i=0; i<parameters.size(); i++)
         {
            Object parameterValue = parameters.get(i);
  -         if (parameterValue!=null)
  +         if ( isRestrictionParameterSet(parameterValue) )
            {
               query.setParameter( "p" + (start + i), parameterValue );
            }
  
  
  
  1.6       +1 -1      jboss-seam/src/main/org/jboss/seam/framework/HibernateEntityQuery.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernateEntityQuery.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/HibernateEntityQuery.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- HibernateEntityQuery.java	14 Dec 2006 08:37:49 -0000	1.5
  +++ HibernateEntityQuery.java	16 Dec 2006 14:06:58 -0000	1.6
  @@ -123,7 +123,7 @@
         for (int i=0; i<parameters.size(); i++)
         {
            Object parameterValue = parameters.get(i);
  -         if (parameterValue!=null)
  +         if ( isRestrictionParameterSet(parameterValue) )
            {
               query.setParameter( "p" + (start + i), parameterValue );
            }
  
  
  
  1.14      +6 -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.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- Query.java	14 Dec 2006 08:37:49 -0000	1.13
  +++ Query.java	16 Dec 2006 14:06:58 -0000	1.14
  @@ -178,7 +178,7 @@
         for (int i=0; i<getRestrictions().size(); i++)
         {
            Object parameterValue = restrictionParameters.get(i).getValue();
  -         if (parameterValue!=null)
  +         if ( isRestrictionParameterSet(parameterValue) )
            {
               if ( builder.toString().toLowerCase().indexOf("where")>0 )
               {
  @@ -197,6 +197,11 @@
         return builder.toString();
      }
   
  +   protected boolean isRestrictionParameterSet(Object parameterValue)
  +   {
  +      return parameterValue!=null && !"".equals(parameterValue);
  +   }
  +
      protected String getCountEjbql()
      {
         String ejbql = getRenderedEjbql();