unico 2004/07/08 08:22:50
Modified: src/stores/org/apache/slide/store/impl/rdbms/expression
RDBMSMergeExpression.java
Log:
fix mixed generic expressions and rdbmsexpressions in merge expression
Revision Changes Path
1.3 +9 -9
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSMergeExpression.java
Index: RDBMSMergeExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSMergeExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RDBMSMergeExpression.java 5 Jul 2004 16:45:55 -0000 1.2
+++ RDBMSMergeExpression.java 8 Jul 2004 15:22:50 -0000 1.3
@@ -38,7 +38,7 @@
private final String _name;
private final String _namespace;
private final Collection _rdbmsExpressions;
- private IBasicExpression _merger;
+ private final Collection _otherExpressions;
public RDBMSMergeExpression(String name,
String namespace,
@@ -49,9 +49,7 @@
_name = name;
_namespace = namespace;
_rdbmsExpressions = rdbmsExpressions;
- if (otherExpressions != null) {
- _merger = _factory.createStandardMergeExpression(_name, _namespace,
otherExpressions);
- }
+ _otherExpressions = otherExpressions;
}
public IBasicResultSet execute() throws SearchException {
@@ -68,8 +66,10 @@
}
}
}
- if (_merger != null) {
- return _merger.execute();
+ if (_otherExpressions != null) {
+ IBasicExpression merger = _factory.createStandardMergeExpression(
+ _name, _namespace, _otherExpressions);
+ return merger.execute();
}
return _context.results();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
