merged develop branch

orientechnologies · Jul 21, 2015 · 67331ef · 67331ef
1 parent a854f49
commit 67331ef
Show file tree

Hide file tree

Showing 352 changed files with 13,671 additions and 11,971 deletions.
diff --git a/.../main/java/com/orientechnologies/orient/client/remote/OSBTreeCollectionManagerRemote.java b/.../main/java/com/orientechnologies/orient/client/remote/OSBTreeCollectionManagerRemote.java
@@ -29,6 +29,9 @@
 import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.common.serialization.types.OBinarySerializer;
 import com.orientechnologies.common.serialization.types.OIntegerSerializer;
+import com.orientechnologies.orient.core.OOrientShutdownListener;
+import com.orientechnologies.orient.core.OOrientStartupListener;
+import com.orientechnologies.orient.core.Orient;
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.db.record.ridbag.ORidBag;
@@ -43,26 +46,39 @@
 /**
  * @author Artem Orobets (enisher-at-gmail.com)
  */
-public class OSBTreeCollectionManagerRemote extends OSBTreeCollectionManagerAbstract {
+public class OSBTreeCollectionManagerRemote extends OSBTreeCollectionManagerAbstract implements OOrientStartupListener,
+    OOrientShutdownListener {
 
-  private final OCollectionNetworkSerializer                   networkSerializer;
-  private boolean                                              remoteCreationAllowed = false;
+  private final OCollectionNetworkSerializer                      networkSerializer;
+  private boolean                                                 remoteCreationAllowed = false;
 
-  private final ThreadLocal<Map<UUID, WeakReference<ORidBag>>> pendingCollections    = new ThreadLocal<Map<UUID, WeakReference<ORidBag>>>() {
-                                                                                       @Override
-                                                                                       protected Map<UUID, WeakReference<ORidBag>> initialValue() {
-                                                                                         return new HashMap<UUID, WeakReference<ORidBag>>();
-                                                                                       }
-                                                                                     };
+  private volatile ThreadLocal<Map<UUID, WeakReference<ORidBag>>> pendingCollections    = new PendingCollectionsThreadLocal();
 
   public OSBTreeCollectionManagerRemote() {
     super();
     networkSerializer = new OCollectionNetworkSerializer();
+
+    Orient.instance().registerWeakOrientStartupListener(this);
+    Orient.instance().registerWeakOrientShutdownListener(this);
   }
 
   public OSBTreeCollectionManagerRemote(OCollectionNetworkSerializer networkSerializer) {
     super();
     this.networkSerializer = networkSerializer;
+
+    Orient.instance().registerWeakOrientStartupListener(this);
+    Orient.instance().registerWeakOrientShutdownListener(this);
+  }
+
+  @Override
+  public void onShutdown() {
+    pendingCollections = null;
+  }
+
+  @Override
+  public void onStartup() {
+    if (pendingCollections == null)
+      pendingCollections = new PendingCollectionsThreadLocal();
   }
 
   @Override
@@ -144,4 +160,11 @@ public Map<UUID, OBonsaiCollectionPointer> changedIds() {
   public void clearChangedIds() {
     throw new UnsupportedOperationException();
   }
+
+  private static class PendingCollectionsThreadLocal extends ThreadLocal<Map<UUID, WeakReference<ORidBag>>> {
+    @Override
+    protected Map<UUID, WeakReference<ORidBag>> initialValue() {
+      return new HashMap<UUID, WeakReference<ORidBag>>();
+    }
+  }
 }