[DS-773] Reduce memory retained by objects with finalizers

git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5915 9c30dcfa-912a-0410-8fc2-9e0234be79fd
DSpace · Dec 2, 2010 · b6339c3 · b6339c3
1 parent 687c560
commit b6339c3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/core/Context.java b/dspace-api/src/main/java/org/dspace/core/Context.java
@@ -304,6 +304,7 @@ public void complete() throws SQLException
             // Free the connection
             DatabaseManager.freeConnection(connection);
             connection = null;
+            clearCache();
         }
     }
 
@@ -430,6 +431,7 @@ public void abort()
             }
             connection = null;
             events = null;
+            clearCache();
         }
     }
 

diff --git a/dspace-api/src/main/java/org/dspace/search/DSQuery.java b/dspace-api/src/main/java/org/dspace/search/DSQuery.java
@@ -446,18 +446,26 @@ protected static synchronized IndexSearcher getSearcher(Context c)
         {
             // So, open a new searcher
             lastModified = IndexReader.getCurrentVersion(indexDir);
-            searcher = new IndexSearcher(indexDir){
-            	/* 
-            	 * TODO: Has Lucene fixed this bug yet?
-            	 * Lucene doesn't release read locks in 
-            	 * windows properly on finalize. Our hack
-            	 * extend IndexSearcher to force close().
-            	 */
-                protected void finalize() throws Throwable {
-            		this.close();
-            		super.finalize();
-            	}
-            };
+            String osName = System.getProperty("os.name");
+            if (osName != null && osName.toLowerCase().contains("windows"))
+            {
+                searcher = new IndexSearcher(indexDir){
+                    /*
+                     * TODO: Has Lucene fixed this bug yet?
+                     * Lucene doesn't release read locks in
+                     * windows properly on finalize. Our hack
+                     * extend IndexSearcher to force close().
+                     */
+                    protected void finalize() throws Throwable {
+                        this.close();
+                        super.finalize();
+                    }
+                };
+            }
+            else
+            {
+                searcher = new IndexSearcher(indexDir);
+            }
         }
 
         return searcher;

diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java
@@ -242,5 +242,7 @@ public void close()
         catch (SQLException sqle)
         {
         }
+
+        columnNames = null;
     }
 }