Index manager close bug was fixed.

andrii0lomakin · andrii0lomakin · commit 6f112382ca68 · 2013-07-22T12:57:26.000+03:00
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerAbstract.java
@@ -15,7 +15,15 @@
  */
 package com.orientechnologies.orient.core.index;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -253,7 +261,7 @@ public void close() {
         if (indexInternal != null) {
           indexInternal.close();
 
-          final ODatabaseRecord databaseRecord = getDatabase();
+          final ODatabaseRecord databaseRecord = ODatabaseRecordThreadLocal.INSTANCE.getIfDefined();
           if (databaseRecord != null)
             databaseRecord.unregisterListener(indexInternal);
         }
diff --git a/server/src/main/java/com/orientechnologies/orient/server/network/protocol/binary/ONetworkProtocolBinary.java b/server/src/main/java/com/orientechnologies/orient/server/network/protocol/binary/ONetworkProtocolBinary.java
@@ -1121,8 +1121,7 @@ protected void command() throws IOException {
         listener.setFetchPlan(((OCommandRequestInternal) connection.database.command(command)).getFetchPlan());
 
         ((OCommandRequestInternal) connection.database.command(command)).execute();
-        
-        
+
         if (empty.get())
           try {
             sendOk(clientTxId);
