wam 2004/02/11 06:20:05
Modified: src/share/org/apache/slide/search/basic
BasicExpressionCompiler.java
Log:
bugfix in merging expressions
Revision Changes Path
1.7 +6 -8
jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionCompiler.java
Index: BasicExpressionCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionCompiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicExpressionCompiler.java 11 Feb 2004 11:30:16 -0000 1.6
+++ BasicExpressionCompiler.java 11 Feb 2004 14:20:05 -0000 1.7
@@ -187,7 +187,6 @@
// we're interested in the one and only expression
expressionsByFactory.put (fac, expList.get(0));
}
-
}
// if there is more than one entry in the map (expressions of different
@@ -198,9 +197,10 @@
mergeExpression =
genericExpressionFactory.createMergeExpression (name, namespace,
- expressionsToMerge);
+ exprToMerge);
}
else {
+ it = expressionsByFactory.values().iterator();
if (it.hasNext())
mergeExpression = (IBasicExpression)it.next();
}
@@ -243,8 +243,6 @@
return expression;
}
-
-
/**
* Returns <code>true</code> if the given <code>expressionElement</code>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
