Merge remote-tracking branch 'origin/master'

This commit is contained in:
NathanSweet 2015-03-26 00:35:32 +01:00
commit bf1b9ecf6b
3 changed files with 5 additions and 5 deletions

View File

@ -24,7 +24,7 @@ To use reflectasm with maven, please use the following snippet in your pom.xml
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>reflectasm</artifactId>
<version>1.10.0</version>
<version>1.10.1</version>
</dependency>
```
@ -34,7 +34,7 @@ If you already have asm in a different version (than the one pulled in by reflec
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>reflectasm</artifactId>
<version>1.10.0</version>
<version>1.10.1</version>
<classifier>shaded</classifier>
<exclusions>
<exclusion>

View File

@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.esotericsoftware</groupId>
<artifactId>reflectasm</artifactId>
<version>1.10.1-SNAPSHOT</version>
<version>1.10.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ReflectASM</name>
<description>High performance Java reflection using code generation</description>
@ -43,7 +43,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>4.2</version>
<version>5.0.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -86,7 +86,7 @@ public class ClassLoaderTest extends TestCase {
}
// Yeah, both reclaimed!
assertEquals(1, AccessClassLoader.activeAccessClassLoaders());
assertEquals(Math.min(initialCount, 1), AccessClassLoader.activeAccessClassLoaders());
}
public void testRemoveClassloaders () throws Exception {