hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 05:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-707] Fix multithreading issues

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5481 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Graham Triggs
2010-10-20 14:05:34 +00:00
parent b19e893557
commit b67fa3fbed
6 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
dspace-api/src/main/java/org/dspace/content/MetadataField.java
View File

@@ -620,7 +620,10 @@ public class MetadataField
public static MetadataField find(Context context, int id)
throws SQLException
{
initCache(context);
if (!isCacheInitialized())
{
initCache(context);
}
// 'sanity check' first.
Integer iid = new Integer(id);
@@ -636,41 +639,40 @@ public class MetadataField
id2field = null;
}
// load caches if necessary
private static void initCache(Context context) throws SQLException
private static boolean isCacheInitialized()
{
if (id2field != null)
return;
synchronized (MetadataField.class)
return id2field != null;
}
// load caches if necessary
private static synchronized void initCache(Context context) throws SQLException
{
if (!isCacheInitialized())
{
if (id2field == null)
HashMap new_id2field = new HashMap();
log.info("Loading MetadataField elements into cache.");
// Grab rows from DB
TableRowIterator tri = DatabaseManager.queryTable(context,"MetadataFieldRegistry",
"SELECT * from MetadataFieldRegistry");
try
{
HashMap new_id2field = new HashMap();
log.info("Loading MetadataField elements into cache.");
// Grab rows from DB
TableRowIterator tri = DatabaseManager.queryTable(context,"MetadataFieldRegistry",
"SELECT * from MetadataFieldRegistry");
try
while (tri.hasNext())
{
while (tri.hasNext())
{
TableRow row = tri.next();
int fieldID = row.getIntColumn("metadata_field_id");
new_id2field.put(new Integer(fieldID), new MetadataField(row));
}
TableRow row = tri.next();
int fieldID = row.getIntColumn("metadata_field_id");
new_id2field.put(new Integer(fieldID), new MetadataField(row));
}
finally
{
// close the TableRowIterator to free up resources
if (tri != null)
tri.close();
}
id2field = new_id2field;
}
finally
{
// close the TableRowIterator to free up resources
if (tri != null)
tri.close();
}
id2field = new_id2field;
}
}