Author: adrianc
Date: Wed Jan 6 20:07:53 2010
New Revision: 896649
URL: http://svn.apache.org/viewvc?rev=896649&view=rev
Log:
A simpler version of my previous commit.
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java?rev=896649&r1=896648&r2=896649&view=diff
==============================================================================
---
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java
(original)
+++
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java
Wed Jan 6 20:07:53 2010
@@ -121,17 +121,16 @@
@Override
public Calendar next(Calendar cal) {
- Set<Calendar> resultSet = new TreeSet<Calendar>();
+ Calendar result = null;
for (TemporalExpression expression : this.expressionSet) {
Calendar next = expression.next(cal);
if (next != null && includesDate(next)) {
- resultSet.add(next);
+ if (result == null || next.before(result)) {
+ result = next;
+ }
}
}
- if (!resultSet.isEmpty()) {
- return resultSet.iterator().next();
- }
- return null;
+ return result;
}
@Override
