You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/05/06 16:09:43 UTC
svn commit: r1479575 -
/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java
Author: sebb
Date: Mon May 6 14:09:43 2013
New Revision: 1479575
URL: http://svn.apache.org/r1479575
Log:
Fix up internal raw types
Modified:
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java?rev=1479575&r1=1479574&r2=1479575&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java Mon May 6 14:09:43 2013
@@ -62,11 +62,11 @@ public class MemoryLeakTestCase extends
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
- Class beanClass = loader.loadClass(className);
+ Class<?> beanClass = loader.loadClass(className);
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
- WeakReference someRef = new WeakReference(loader);
+ WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -111,11 +111,11 @@ public class MemoryLeakTestCase extends
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
- Class beanClass = loader.loadClass(className);
+ Class<?> beanClass = loader.loadClass(className);
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
- WeakReference someRef = new WeakReference(loader);
+ WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -162,13 +162,14 @@ public class MemoryLeakTestCase extends
String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
ClassLoader loader = newClassLoader();
- Class beanClass = loader.loadClass(className);
+ Class<?> beanClass = loader.loadClass(className);
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
assertNotNull("BeanClass is null", beanClass);
+ assertNotNull("Bean is null", bean);
assertNotSame("ClassLoaders should be different..", getClass().getClassLoader(), beanClass.getClassLoader());
assertSame("BeanClass ClassLoader incorrect", beanClass.getClassLoader(), loader);
@@ -206,13 +207,14 @@ public class MemoryLeakTestCase extends
String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
ClassLoader loader = newClassLoader();
- Class beanClass = loader.loadClass(className);
+ Class<?> beanClass = loader.loadClass(className);
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
assertNotNull("BeanClass is null", beanClass);
+ assertNotNull("Bean is null", bean);
assertNotSame("ClassLoaders should be different..", getClass().getClassLoader(), beanClass.getClassLoader());
assertSame("BeanClass ClassLoader incorrect", beanClass.getClassLoader(), loader);
@@ -256,11 +258,11 @@ public class MemoryLeakTestCase extends
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
- Class beanClass = loader.loadClass(className);
+ Class<?> beanClass = loader.loadClass(className);
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
- WeakReference someRef = new WeakReference(loader);
+ WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -305,12 +307,12 @@ public class MemoryLeakTestCase extends
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
- Class beanClass = loader.loadClass(className);
+ Class<?> beanClass = loader.loadClass(className);
Object bean = beanClass.newInstance();
WrapDynaBean wrapDynaBean = new WrapDynaBean(bean);
// -----------------------------------------------------------------------------
- WeakReference someRef = new WeakReference(loader);
+ WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -357,11 +359,11 @@ public class MemoryLeakTestCase extends
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
- Class beanClass = loader.loadClass(className);
+ Class<?> beanClass = loader.loadClass(className);
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
- WeakReference someRef = new WeakReference(loader);
+ WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -404,11 +406,11 @@ public class MemoryLeakTestCase extends
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
- Class beanClass = loader.loadClass(className);
+ Class<?> beanClass = loader.loadClass(className);
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
- WeakReference someRef = new WeakReference(loader);
+ WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -471,10 +473,10 @@ public class MemoryLeakTestCase extends
*/
private void forceGarbageCollection() throws Exception {
// Fill up memory
- SoftReference ref = new SoftReference(new Object());
+ SoftReference<Object> ref = new SoftReference<Object>(new Object());
int count = 0;
while(ref.get() != null && count++ < 5) {
- java.util.ArrayList list = new java.util.ArrayList();
+ java.util.ArrayList<String> list = new java.util.ArrayList<String>();
try {
long i = 0;
while (true && ref.get() != null) {