githubcs
diff --git a/‎app/com/baasbox/db/DbHelper.java
Lines changed: 3 additions & 3 deletions b/‎app/com/baasbox/db/DbHelper.java
Lines changed: 3 additions & 3 deletions
diff --git a/‎app/com/baasbox/db/hook/HooksManager.java
Lines changed: 8 additions & 4 deletions b/‎app/com/baasbox/db/hook/HooksManager.java
Lines changed: 8 additions & 4 deletions
diff --git a/‎project/Build.scala
Lines changed: 1 addition & 0 deletions b/‎project/Build.scala
Lines changed: 1 addition & 0 deletions
@@ -224,7 +224,7 @@ public static void shutdownDB(boolean repopulate){
 
 		try{
 			//WE GET THE CONNECTION BEFORE SETTING THE SEMAPHORE
-			db = DbHelper.open( BBConfiguration.getAPPCODE(),"admin", "admin");
+			db = getConnection()
8000
;
 
 			synchronized(DbHelper.class)  {
 				if(!dbFreeze.get()){
@@ -295,7 +295,7 @@ public static OGraphDatabase reconnectAsAuthenticatedUser (){
 	public static void close(OGraphDatabase db) {
 		Logger.debug("closing connection");
 		if (db!=null && !db.isClosed()){
-			HooksManager.unregisteredAll(db);
+			//HooksManager.unregisteredAll(db);
 			db.close();
 		}else Logger.debug("connection already close or null");
 	}
@@ -507,8 +507,8 @@ public void onMessage(String m) {
 			 Logger.info("...setting up internal user credential...");
 			 updateDefaultUsers();
 			 Logger.info("...registering hooks...");
-			 HooksManager.registerAll(db);
 			 evolveDB(db);
+			 HooksManager.registerAll(db);
 		}catch(Exception ioe){
 			Logger.error("*** Error importing the db: ", ioe);
 
@@ -18,15 +18,18 @@
 
 
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.collections.IteratorUtils;
+
 import play.Logger;
 
 import com.orientechnologies.orient.core.db.graph.OGraphDatabase;
 import com.orientechnologies.orient.core.hook.ORecordHook;
 import com.orientechnologies.orient.core.hook.ORecordHook.HOOK_POSITION;
 
-public class HooksManager {
+public class HooksManager { 
 	public static void registerAll(OGraphDatabase db){
 		Logger.trace("Method Start");
 		Logger.debug("Registering hooks...");
@@ -53,18 +56,19 @@ public static void registerAll(OGraphDatabase db){
 	public static void unregisteredAll(OGraphDatabase db){
 
 		Logger.trace("Method Start");
-		/*
+		
 		Logger.debug("unregistering hooks...");
 		Set<ORecordHook> hooks = db.getHooks();
-		Iterator<ORecordHook> it =hooks.iterator();
+		List hs = IteratorUtils.toList(hooks.iterator());
+		Iterator<ORecordHook> it =hs.iterator();
 		while (it.hasNext()){
 			ORecordHook h = it.next();
 			if (h instanceof BaasBoxHook) {
 				Logger.debug("Removing "+ ((BaasBoxHook) h).getHookName() + " hook");
 				db.unregisterHook(h);
 			}
 		}
-				*/
+				
 		Logger.trace("Method End");
 
 	}
 
@@ -13,6 +13,7 @@ object ApplicationBuild extends Build {
     			javaCore,filters,
     			"commons-io" % "commons-io" % "2.4",
     			"commons-lang" % "commons-lang" % "2.6",
+    			"commons-collections" % "commons-collections" % "3.2",
     			"xalan"  % "xalan"  % "2.7.1",
     			"org.imgscalr" % "imgscalr-lib" % "4.2",
     			"org.apache.commons" % "commons-email" % "1.3.1",