Do not use a reserved word as a package name.

jbachorik · jbachorik · commit ec65543b05fd · 2021-07-25T19:31:18.000+02:00
In Window 'aux' is a reserved word. Rename the package to 'auxiliary' Fixes btraceio#478
diff --git a/btrace-instr/src/test/java/org/openjdk/btrace/instr/InstrumentorTestBase.java b/btrace-instr/src/test/java/org/openjdk/btrace/instr/InstrumentorTestBase.java
@@ -55,7 +55,7 @@
 import org.openjdk.btrace.core.MethodID;
 import org.openjdk.btrace.core.SharedSettings;
 import org.openjdk.btrace.runtime.BTraceRuntimeAccess;
-import org.openjdk.btrace.runtime.aux.Auxilliary;
+import org.openjdk.btrace.runtime.auxiliary.Auxiliary;
 import sun.misc.Unsafe;
 
 /** @author Jaroslav Bachorik */
@@ -193,7 +193,7 @@ public void visit(
                   String[] interfaces) {
                 int idx = name.lastIndexOf('/');
                 name =
-                    Auxilliary.class.getPackage().getName().replace('.', '/')
+                    Auxiliary.class.getPackage().getName().replace('.', '/')
                         + '/'
                         + name.substring(idx + 1);
                 super.visit(version, access, name, signature, superName, interfaces);
diff --git a/btrace-runtime/src/main/java/org/openjdk/btrace/runtime/BTraceRuntimeAccess.java b/btrace-runtime/src/main/java/org/openjdk/btrace/runtime/BTraceRuntimeAccess.java
@@ -41,7 +41,7 @@
 import org.openjdk.btrace.core.handlers.ExitHandler;
 import org.openjdk.btrace.core.handlers.LowMemoryHandler;
 import org.openjdk.btrace.core.handlers.TimerHandler;
-import org.openjdk.btrace.runtime.aux.Auxilliary;
+import org.openjdk.btrace.runtime.auxiliary.Auxiliary;
 import org.openjdk.btrace.services.api.RuntimeContext;
 
 /**
@@ -138,11 +138,11 @@ public static String getClientName(String forClassName) {
     int idx = forClassName.lastIndexOf('/');
     if (idx > -1) {
       forClassName =
-          Auxilliary.class.getPackage().getName().replace('.', '/')
+          Auxiliary.class.getPackage().getName().replace('.', '/')
               + "/"
               + forClassName.substring(idx + 1);
     } else {
-      forClassName = Auxilliary.class.getPackage().getName().replace('.', '/') + "/" + forClassName;
+      forClassName = Auxiliary.class.getPackage().getName().replace('.', '/') + "/" + forClassName;
     }
 
     if (!uniqueClientClassNames) {
diff --git a/btrace-runtime/src/main/java/org/openjdk/btrace/runtime/aux/Auxilliary.java b/btrace-runtime/src/main/java/org/openjdk/btrace/runtime/aux/Auxilliary.java
diff --git a/btrace-runtime/src/main/java/org/openjdk/btrace/runtime/auxiliary/Auxiliary.java b/btrace-runtime/src/main/java/org/openjdk/btrace/runtime/auxiliary/Auxiliary.java
@@ -0,0 +1,3 @@
+package org.openjdk.btrace.runtime.auxiliary;
+
+public final class Auxiliary {}
diff --git a/btrace-runtime/src/main/java11/org/openjdk/btrace/runtime/BTraceRuntimeImpl_11.java b/btrace-runtime/src/main/java11/org/openjdk/btrace/runtime/BTraceRuntimeImpl_11.java
@@ -44,7 +44,7 @@
 import org.openjdk.btrace.core.DebugSupport;
 import org.openjdk.btrace.core.comm.CommandListener;
 import org.openjdk.btrace.core.jfr.JfrEvent;
-import org.openjdk.btrace.runtime.aux.Auxilliary;
+import org.openjdk.btrace.runtime.auxiliary.Auxiliary;
 
 /**
  * Helper class used by BTrace built-in functions and also acts runtime "manager" for a specific
@@ -134,7 +134,7 @@ public Class<?> defineClass(byte[] code, boolean mustBeBootstrap) {
       }
 
       Class<?> clz =
-          MethodHandles.privateLookupIn(Auxilliary.class, MethodHandles.lookup()).defineClass(code);
+          MethodHandles.privateLookupIn(Auxiliary.class, MethodHandles.lookup()).defineClass(code);
       // initialize the class by creating a dummy instance
       clz.getConstructor().newInstance();
       return clz;
diff --git a/btrace-runtime/src/main/java9/org/openjdk/btrace/runtime/BTraceRuntimeImpl_9.java b/btrace-runtime/src/main/java9/org/openjdk/btrace/runtime/BTraceRuntimeImpl_9.java
@@ -43,7 +43,7 @@
 import org.openjdk.btrace.core.DebugSupport;
 import org.openjdk.btrace.core.comm.CommandListener;
 import org.openjdk.btrace.core.jfr.JfrEvent;
-import org.openjdk.btrace.runtime.aux.Auxilliary;
+import org.openjdk.btrace.runtime.auxiliary.Auxiliary;
 
 /**
  * Helper class used by BTrace built-in functions and also acts runtime "manager" for a specific
@@ -123,7 +123,7 @@ public Class<?> defineClass(byte[] code, boolean mustBeBootstrap) {
       }
 
       Class<?> clz =
-          MethodHandles.privateLookupIn(Auxilliary.class, MethodHandles.lookup()).defineClass(code);
+          MethodHandles.privateLookupIn(Auxiliary.class, MethodHandles.lookup()).defineClass(code);
       // initialize the class by creating a dummy instance
       clz.getConstructor().newInstance();
       return clz;
@@ -146,7 +146,7 @@ public Class<?> defineClass(byte[] code, boolean mustBeBootstrap) {
   public static Class<?> defineClass(byte[] code) {
     try {
       Class<?> clz =
-          MethodHandles.privateLookupIn(Auxilliary.class, MethodHandles.lookup()).defineClass(code);
+          MethodHandles.privateLookupIn(Auxiliary.class, MethodHandles.lookup()).defineClass(code);
       // initialize the class by creating a dummy instance
       clz.getConstructor().newInstance();
       return clz;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package org.openjdk.btrace.runtime.auxiliary;`
	`2`	`+`
	`3`	`+public final class Auxiliary {}`