merging changes from freeze_strategy branch

1 files changed, 6 insertions, 5 deletions

diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java
index 6d0e5b8bc09..f221f562910 100644
--- a/java/demo/Freeze/library/Server.java
+++ b/java/demo/Freeze/library/Server.java
@@ -25,15 +25,16 @@ class LibraryServer extends Freeze.Application
 	//
 	// Create an Evictor for books.
 	//
-	Freeze.Evictor evictor;
-	if(properties.getPropertyAsInt("Library.SaveAfterMutatingOperation") > 0)
+	Freeze.PersistenceStrategy strategy;
+	if(properties.getPropertyAsInt("Library.IdleStrategy") > 0)
 	{
-	    evictor = dbBooks.createEvictor(Freeze.EvictorPersistenceMode.SaveAfterMutatingOperation);
+            strategy = dbBooks.createIdleStrategy();
 	}
 	else
 	{
-	    evictor = dbBooks.createEvictor(Freeze.EvictorPersistenceMode.SaveUponEviction);
+            strategy = dbBooks.createEvictionStrategy();
 	}
+	Freeze.Evictor evictor = dbBooks.createEvictor(strategy);
 	int evictorSize = properties.getPropertyAsInt("Library.EvictorSize");
 	if(evictorSize > 0)
 	{
@@ -83,6 +84,6 @@ public class Server
     main(String[] args)
     {
 	LibraryServer app = new LibraryServer("db");
-	app.main("test.Freeze.library.Server", args, "config");
+	app.main("demo.Freeze.library.Server", args, "config");
     }
 }