unico       2004/11/01 02:52:53

  Modified:    src/stores/org/apache/slide/store/impl/rdbms/expression Tag:
                        SLIDE_2_1_RELEASE_BRANCH
                        RDBMSCompareExpression.java
  Log:
  fix problem with nested merge expressions
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.4.2.2   +5 -5      
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSCompareExpression.java
  
  Index: RDBMSCompareExpression.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSCompareExpression.java,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- RDBMSCompareExpression.java       27 Sep 2004 11:51:54 -0000      1.4.2.1
  +++ RDBMSCompareExpression.java       1 Nov 2004 10:52:52 -0000       1.4.2.2
  @@ -50,7 +50,7 @@
       }
       
       protected final Element _element;
  -    protected int _tableIndex;
  +    protected int _tableIndex = -1;
       private Element _property;
   
       public RDBMSCompareExpression(Element element, RDBMSQueryContext context) {
  @@ -72,7 +72,7 @@
                   }
               }
           }
  -        else {
  +        if (_tableIndex == -1) {
               _tableIndex = _context.joins().size();
           }
           _context.joins().add(join());
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to