Author: sandymac Date: Sat Mar 25 00:27:52 2006 New Revision: 388728 URL: http://svn.apache.org/viewcvs?rev=388728&view=rev Log: Improve robustness of memory pressure tests.
Modified: jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/composite/TestCompositeObjectPool.java jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java Modified: jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/composite/TestCompositeObjectPool.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/composite/TestCompositeObjectPool.java?rev=388728&r1=388727&r2=388728&view=diff ============================================================================== --- jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/composite/TestCompositeObjectPool.java (original) +++ jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/composite/TestCompositeObjectPool.java Sat Mar 25 00:27:52 2006 @@ -421,7 +421,11 @@ List garbage = new LinkedList(); Runtime runtime = Runtime.getRuntime(); while (pool.getNumIdle() > 0) { - garbage.add(new byte[Math.min(1024 * 1024, (int)runtime.freeMemory()/4)]); + try { + garbage.add(new byte[Math.min(1024 * 1024, (int)runtime.freeMemory()/2)]); + } catch (OutOfMemoryError oome) { + System.gc(); + } System.gc(); } garbage.clear(); Modified: jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java?rev=388728&r1=388727&r2=388728&view=diff ============================================================================== --- jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java (original) +++ jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java Sat Mar 25 00:27:52 2006 @@ -62,7 +62,11 @@ final List garbage = new LinkedList(); final Runtime runtime = Runtime.getRuntime(); while (pool.getNumIdle() > 0) { - garbage.add(new byte[Math.min(1024 * 1024, (int)runtime.freeMemory()/4)]); + try { + garbage.add(new byte[Math.min(1024 * 1024, (int)runtime.freeMemory()/2)]); + } catch (OutOfMemoryError oome) { + System.gc(); + } System.gc(); } garbage.clear(); @@ -93,7 +97,11 @@ final List garbage = new LinkedList(); final Runtime runtime = Runtime.getRuntime(); while (pool.getNumIdle() > 0) { - garbage.add(new byte[Math.min(1024 * 1024, (int)runtime.freeMemory()/4)]); + try { + garbage.add(new byte[Math.min(1024 * 1024, (int)runtime.freeMemory()/2)]); + } catch (OutOfMemoryError oome) { + System.gc(); + } System.gc(); } garbage.clear(); @@ -120,7 +128,11 @@ final List garbage = new LinkedList(); final Runtime runtime = Runtime.getRuntime(); while (pool.getNumIdle() > 0) { - garbage.add(new byte[Math.min(1024 * 1024, (int)runtime.freeMemory()/4)]); + try { + garbage.add(new byte[Math.min(1024 * 1024, (int)runtime.freeMemory()/2)]); + } catch (OutOfMemoryError oome) { + System.gc(); + } System.gc(); } garbage.clear(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]