Permalink
Browse files

Merge branch 'H2PR'

  • Loading branch information...
2 parents 4bdb450 + e2171eb commit 5fcb9a42d0d05891b65087a90e2e0c403f8fd026 @timf committed Feb 21, 2013
View
@@ -3,7 +3,7 @@
<groupId>org.dasein</groupId>
<artifactId>dasein-persist</artifactId>
- <version>2013.01-SNAPSHOT</version>
+ <version>2013.02.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>dasein-persist</name>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.dasein</groupId>
<artifactId>dasein-util</artifactId>
- <version>2013.01-SNAPSHOT</version>
+ <version>2013.02</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -43,6 +43,7 @@
import org.dasein.persist.dao.LoadTranslator;
import org.dasein.persist.dao.RemoveTranslator;
import org.dasein.persist.dao.SaveTranslator;
+import org.dasein.util.DaseinUtilTasks;
import org.dasein.util.Translator;
import org.dasein.util.DaseinUtilTasks;
@@ -107,11 +108,10 @@
catch( Exception e ) {
logger.error("Problem reading " + PROPERTIES + ": " + e.getMessage(), e);
}
-
- DaseinUtilTasks.submit(new ExecutionTask());
+ DaseinUtilTasks.submit(new StackPusher());
}
- private static class ExecutionTask implements Runnable {
+ private static class StackPusher implements Runnable {
@Override
public void run() {
pushExecutions();
@@ -24,7 +24,6 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.dasein.util.Jiterator;
import org.dasein.persist.jdbc.Counter;
import org.dasein.persist.jdbc.Creator;
import org.dasein.persist.jdbc.Deleter;
@@ -35,7 +34,9 @@
import org.dasein.util.CacheLoader;
import org.dasein.util.CachedItem;
import org.dasein.util.CacheManagementException;
+import org.dasein.util.DaseinUtilTasks;
import org.dasein.util.JitCollection;
+import org.dasein.util.Jiterator;
import org.dasein.util.JiteratorFilter;
import org.dasein.util.DaseinUtilTasks;
@@ -493,6 +494,7 @@ public void run() {
results = xaction.execute(loader, params, readDataSource);
xaction.commit();
+
DaseinUtilTasks.submit(new RelationalCacheTask(it, results));
return new JitCollection<T>(it, getEntityClassName());
}
Oops, something went wrong.

0 comments on commit 5fcb9a4

Please sign in to comment.