[hibernate-commits] Hibernate SVN: r11409 - trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access.
Author: max.ross
Date: 2007-04-17 01:54:37 -0400 (Tue, 17 Apr 2007)
New Revision: 11409
Modified:
trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java
Log:
fix bug HSHARDS-8, don't pass a null Shard to the ExitStrategy.
Modified:
trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java
===================================================================
---
trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java 2007-04-17
05:53:37 UTC (rev 11408)
+++
trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java 2007-04-17
05:54:37 UTC (rev 11409)
@@ -18,14 +18,13 @@
package org.hibernate.shards.strategy.access;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.shards.Shard;
import org.hibernate.shards.ShardOperation;
import org.hibernate.shards.strategy.exit.ExitOperationsCollector;
import org.hibernate.shards.strategy.exit.ExitStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.util.List;
/**
@@ -37,7 +36,7 @@
public <T> T apply(List<Shard> shards, ShardOperation<T> operation,
ExitStrategy<T> exitStrategy, ExitOperationsCollector exitOperationsCollector) {
for(Shard shard : getNextOrderingOfShards(shards)) {
- if(exitStrategy.addResult(operation.execute(shard), null)) {
+ if(exitStrategy.addResult(operation.execute(shard), shard)) {
log.debug(
String.format(
"Short-circuiting operation %s after execution against shard
%s",