tidyup

2 files changed, 6 insertions, 1 deletions

diff --git a/loadtime/src/main/java/org/aspectj/weaver/loadtime/Agent.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/Agent.java
index eeca8aeef..6dbbf32db 100644
--- a/loadtime/src/main/java/org/aspectj/weaver/loadtime/Agent.java
+++ b/loadtime/src/main/java/org/aspectj/weaver/loadtime/Agent.java
@@ -37,7 +37,7 @@ public class Agent {
      * JSR-163 preMain Agent entry method
      *
      * @param options
-     * @param instrumentation
+     * @param instrumentation 
      */
     public static void premain(String options, Instrumentation instrumentation) {
     	/* Handle duplicate agents */
diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
index b13ebe421..9ed540d17 100644
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
@@ -25,6 +25,7 @@ import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
 import org.aspectj.util.FileUtil;
+import org.aspectj.util.LangUtil;
 
 import junit.framework.TestCase;
 
@@ -53,6 +54,10 @@ public class JRockitAgentTest extends TestCase {
 	}
 
 	public void testJrockitRecursionProtection() {
+		if (LangUtil.is11VMOrGreater()) {
+			// Skip test, not castable to URLClassLoader
+			return;
+		}
 		URLClassLoader thisLoader = (URLClassLoader) getClass().getClassLoader();
 		URL jrockit = FileUtil.getFileURL(new File("../lib/ext/jrockit/jrockit.jar"));
 		URL[] urls = new URL[] {jrockit};