*** empty log message ***

[mir.git] / source / mir / storage / store / StoreContainer.java

diff --git a/source/mir/storage/store/StoreContainer.java b/source/mir/storage/store/StoreContainer.java
index 567d965..acec906 100755 (executable)
--- a/source/mir/storage/store/StoreContainer.java
+++ b/source/mir/storage/store/StoreContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,17 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mir.storage.store;
 
 /**
@@ -46,14 +42,13 @@ package mir.storage.store;
  * @version 1.0
  */
 
-import java.util.LinkedList;
-import java.util.ListIterator;
-
-import javax.servlet.http.HttpServletRequest;
-
 import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.LinkedList;
+import java.util.ListIterator;
+
 public class StoreContainer {
   private final static int DEFAULT_SIZE = 10;
   private static int uniqueCounter = 10000;
@@ -68,7 +63,7 @@ public class StoreContainer {
   protected LoggerWrapper logger = new LoggerWrapper("Database.ObjectStore");
 
   // avoid construction without parameters
-  private StoreContainer() {};
+  private StoreContainer() {}
 
 
   public StoreContainer(StoreContainerType stoc_type) {
@@ -101,15 +96,15 @@ public class StoreContainer {
     return null;
   }
 
-  public boolean has(StoreIdentifier sid) {
+  public synchronized boolean has(StoreIdentifier sid) {
     return container.contains(sid);
   }
 
-  public void add(StoreIdentifier sid) {
+  public synchronized void add(StoreIdentifier sid) {
     if (sid != null && sid.hasReference()) {
       if (has(sid)) {
         moveToHead(sid);
-        logger.error("OBJECTStore: tried to add sid " + sid.toString() + " that was already in store.");
+        logger.debug("OBJECTStore: tried to add sid " + sid.toString() + " that was already in store.");
       }
       else {
         container.addFirst(sid);
@@ -151,7 +146,7 @@ public class StoreContainer {
    *  Description:  readjusts StoreContainer size to value.
    *
    */
-  public void setSize(int size) {
+  public synchronized void setSize(int size) {
     if (size < 0)
       return;
     shrinkToSize(size);
@@ -162,7 +157,7 @@ public class StoreContainer {
     shrinkToSize(maxSize);
   }
 
-  private void shrinkToSize(int size) {
+  private synchronized void shrinkToSize(int size) {
     if (size < container.size()) {
       // shrink
       while (size < container.size()) {
@@ -184,7 +179,7 @@ public class StoreContainer {
   /**
    *  Method:       toString()
    *  Description:  gives out statistical Information, viewable via
-   *                @see ServletStoreInfo.
+   *                @see ServletStoreInfo
    *
    *  @return       String
    */