You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by un...@apache.org on 2004/09/27 13:51:54 UTC
cvs commit: jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression RDBMSCompareExpression.java
unico 2004/09/27 04:51:54
Modified: src/stores/org/apache/slide/store/impl/rdbms/expression Tag:
SLIDE_2_1_RELEASE_BRANCH
RDBMSCompareExpression.java
Log:
result may be null
Revision Changes Path
No revision
No revision
1.4.2.1 +11 -15 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
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- RDBMSCompareExpression.java 28 Jul 2004 09:34:09 -0000 1.4
+++ RDBMSCompareExpression.java 27 Sep 2004 11:51:54 -0000 1.4.2.1
@@ -63,20 +63,16 @@
}
protected IBasicResultSet compile(RDBMSMergeExpression expression) {
- if (expression != null) {
- if (expression.getName().equals(Literals.OR)) {
- Iterator iter = expression.getRDBMSExpressions().iterator();
- while (iter.hasNext()) {
- final RDBMSExpression e = (RDBMSExpression) iter.next();
- if (e instanceof RDBMSCompareExpression) {
- _tableIndex = ((RDBMSCompareExpression) e).getTableIndex();
- }
+ if (expression != null && expression.getName().equals(Literals.OR)) {
+ Iterator iter = expression.getRDBMSExpressions().iterator();
+ while (iter.hasNext()) {
+ final RDBMSExpression e = (RDBMSExpression) iter.next();
+ if (e instanceof RDBMSCompareExpression) {
+ _tableIndex = ((RDBMSCompareExpression) e).getTableIndex();
}
}
- else {
- _tableIndex = _context.joins().size();
- }
- } else {
+ }
+ else {
_tableIndex = _context.joins().size();
}
_context.joins().add(join());
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org