From a7ea580e545390f5df5efc87b7378a9245f8e0ca Mon Sep 17 00:00:00 2001 From: Britt Park Date: Tue, 4 Jul 2006 20:58:26 +0000 Subject: [PATCH] Just cleaning up some warnings. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3280 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/avm/AVMCrawlTest.java | 4 +- .../alfresco/repo/avm/AVMNodeDescriptor.java | 4 ++ .../alfresco/repo/avm/AVMServiceTestBase.java | 1 - .../org/alfresco/repo/avm/AVMStressTest.java | 3 +- .../java/org/alfresco/repo/avm/AVMTester.java | 9 +--- .../alfresco/repo/avm/DirectoryNodeImpl.java | 1 - .../repo/avm/hibernate/HibernateTxn.java | 54 +++++++++---------- 7 files changed, 33 insertions(+), 43 deletions(-) diff --git a/source/java/org/alfresco/repo/avm/AVMCrawlTest.java b/source/java/org/alfresco/repo/avm/AVMCrawlTest.java index 9a7ef0525b..1d3916b56e 100644 --- a/source/java/org/alfresco/repo/avm/AVMCrawlTest.java +++ b/source/java/org/alfresco/repo/avm/AVMCrawlTest.java @@ -35,8 +35,8 @@ public class AVMCrawlTest extends AVMServiceTestBase */ public void testCrawl() { - int n = 8; // Number of Threads. - int m = 16; // How many multiples of content to start with. + int n = 2; // Number of Threads. + int m = 4; // How many multiples of content to start with. long runTime = 1200000; // Ten minutes fService.purgeRepository("main"); fReaper.setInactiveBaseSleep(60000); diff --git a/source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java b/source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java index 53a39bacde..a1af5ae2e5 100644 --- a/source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java +++ b/source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java @@ -351,6 +351,10 @@ public class AVMNodeDescriptor return fID; } + /** + * Get the file length if applicable. + * @return The file length. + */ public long getLength() { return fLength; diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java index 861454cc65..1bf4ab5754 100644 --- a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java +++ b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Map; import java.util.TreeMap; -import org.hibernate.stat.Statistics; import org.springframework.context.support.FileSystemXmlApplicationContext; import junit.framework.TestCase; diff --git a/source/java/org/alfresco/repo/avm/AVMStressTest.java b/source/java/org/alfresco/repo/avm/AVMStressTest.java index fe90726f9e..31590973ee 100644 --- a/source/java/org/alfresco/repo/avm/AVMStressTest.java +++ b/source/java/org/alfresco/repo/avm/AVMStressTest.java @@ -63,8 +63,7 @@ public class AVMStressTest extends AVMServiceTestBase 3200, // read file 10, // snapshot 1000, // # ops - fService, - "" + i); + fService); tester.refresh(); Thread thread = new Thread(tester); testers.add(tester); diff --git a/source/java/org/alfresco/repo/avm/AVMTester.java b/source/java/org/alfresco/repo/avm/AVMTester.java index 755625bb4b..f363e75730 100644 --- a/source/java/org/alfresco/repo/avm/AVMTester.java +++ b/source/java/org/alfresco/repo/avm/AVMTester.java @@ -78,11 +78,6 @@ class AVMTester implements Runnable */ private String[] fNames; - /** - * The id of this thread. - */ - private String fID; - /** * Flag for whether this thread errored out. */ @@ -117,12 +112,10 @@ class AVMTester implements Runnable int readFile, int snapshot, int opCount, - AVMService service, - String id) + AVMService service) { fError = false; fExit = false; - fID = id; fService = service; fOpCount = opCount; int count = createFile + createDir + rename + createLayeredDir + diff --git a/source/java/org/alfresco/repo/avm/DirectoryNodeImpl.java b/source/java/org/alfresco/repo/avm/DirectoryNodeImpl.java index 20dd7c840b..c6bdb426fd 100644 --- a/source/java/org/alfresco/repo/avm/DirectoryNodeImpl.java +++ b/source/java/org/alfresco/repo/avm/DirectoryNodeImpl.java @@ -19,7 +19,6 @@ package org.alfresco.repo.avm; import java.util.List; -import org.hibernate.LockMode; import org.hibernate.Query; import org.hibernate.Session; diff --git a/source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java b/source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java index 65fa8bb5b9..b635302148 100644 --- a/source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java +++ b/source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java @@ -23,13 +23,9 @@ import org.alfresco.repo.avm.AVMException; import org.alfresco.repo.avm.AVMNotFoundException; import org.hibernate.HibernateException; import org.hibernate.JDBCException; -import org.hibernate.ObjectNotFoundException; import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.StaleStateException; import org.hibernate.Transaction; -import org.hibernate.exception.GenericJDBCException; -import org.hibernate.exception.LockAcquisitionException; import org.springframework.dao.DataRetrievalFailureException; import org.springframework.dao.DeadlockLoserDataAccessException; import org.springframework.dao.OptimisticLockingFailureException; @@ -103,38 +99,38 @@ public class HibernateTxn extends HibernateTemplate { // Do nothing. } - // Translate the exception. - if (t instanceof JDBCException) + } + // Translate the exception. + if (t instanceof JDBCException) + { + t = convertJdbcAccessException((JDBCException)t); + } + else if (t instanceof HibernateException) + { + t = convertHibernateAccessException((HibernateException)t); + } + // If we've lost a race or we've deadlocked, retry. + if (t instanceof DeadlockLoserDataAccessException) + { + try { - t = convertJdbcAccessException((JDBCException)t); - } - else if (t instanceof HibernateException) - { - t = convertHibernateAccessException((HibernateException)t); - } - // If we've lost a race or we've deadlocked, retry. - if (t instanceof DeadlockLoserDataAccessException) - { - try + long interval; + synchronized (fRandom) { - long interval; - synchronized (fRandom) - { - interval = fRandom.nextInt(1000); - } - Thread.sleep(interval); - continue; - } - catch (InterruptedException ie) - { - // Do nothing. + interval = fRandom.nextInt(1000); } + Thread.sleep(interval); continue; } - if (t instanceof OptimisticLockingFailureException) + catch (InterruptedException ie) { - continue; + // Do nothing. } + continue; + } + if (t instanceof OptimisticLockingFailureException) + { + continue; } if (t instanceof AVMException) {