From 4153c34e579255f692ad32d999baf9d2c6d3872d Mon Sep 17 00:00:00 2001
From: Matteo Di Giovinazzo <digiovinazzo@streamsim.com>
Date: Sun, 19 Jul 2020 22:38:21 +0200
Subject: [PATCH] Rename pointers to javacpp MXBean object name, move check for
 system property org.bytedeco.javacpp.mxbean in Pointer

---
 src/main/java/org/bytedeco/javacpp/Pointer.java  |  7 ++++++-
 .../java/org/bytedeco/javacpp/tools/Logger.java  |  5 -----
 ...lMXBean.java => PointerBufferPoolMXBean.java} | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename src/main/java/org/bytedeco/javacpp/tools/{PointersBufferPoolMXBean.java => PointerBufferPoolMXBean.java} (69%)

diff --git a/src/main/java/org/bytedeco/javacpp/Pointer.java b/src/main/java/org/bytedeco/javacpp/Pointer.java
index 9aaaf8a87..f892e6372 100644
--- a/src/main/java/org/bytedeco/javacpp/Pointer.java
+++ b/src/main/java/org/bytedeco/javacpp/Pointer.java
@@ -34,8 +34,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import org.bytedeco.javacpp.annotation.Name;
-import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.tools.Generator;
+import org.bytedeco.javacpp.tools.PointerBufferPoolMXBean;
 import org.bytedeco.javacpp.tools.Logger;
 
 /**
@@ -510,6 +510,11 @@ public static long parseBytes(String string, long relativeMultiple) throws Numbe
         } catch (Throwable t) {
             logger.warn("Could not load Pointer: " + t);
         }
+
+        String mx = System.getProperty("org.bytedeco.javacpp.mxbean", "false").toLowerCase();
+        if (mx.equals("true") || mx.equals("t") || mx.equals("")) {
+            PointerBufferPoolMXBean.register();
+        }
     }
 
     /** Clears, deallocates, and removes all garbage collected objects from the {@link #referenceQueue}. */
diff --git a/src/main/java/org/bytedeco/javacpp/tools/Logger.java b/src/main/java/org/bytedeco/javacpp/tools/Logger.java
index fb5595dee..ce58d29a0 100644
--- a/src/main/java/org/bytedeco/javacpp/tools/Logger.java
+++ b/src/main/java/org/bytedeco/javacpp/tools/Logger.java
@@ -43,11 +43,6 @@ public static Logger create(Class cls) {
     static {
         String s = System.getProperty("org.bytedeco.javacpp.logger.debug", "false").toLowerCase();
         debug = s.equals("true") || s.equals("t") || s.equals("");
-
-        String mx = System.getProperty("org.bytedeco.javacpp.mxbean", "false").toLowerCase();
-        if (mx.equals("true") || mx.equals("t") || mx.equals("")) {
-            PointersBufferPoolMXBean.register();
-        }
     }
 
     /** Returns the "org.bytedeco.javacpp.logger.debug" system property. */
diff --git a/src/main/java/org/bytedeco/javacpp/tools/PointersBufferPoolMXBean.java b/src/main/java/org/bytedeco/javacpp/tools/PointerBufferPoolMXBean.java
similarity index 69%
rename from src/main/java/org/bytedeco/javacpp/tools/PointersBufferPoolMXBean.java
rename to src/main/java/org/bytedeco/javacpp/tools/PointerBufferPoolMXBean.java
index 3bbc5efd3..0bc24ea75 100644
--- a/src/main/java/org/bytedeco/javacpp/tools/PointersBufferPoolMXBean.java
+++ b/src/main/java/org/bytedeco/javacpp/tools/PointerBufferPoolMXBean.java
@@ -6,25 +6,25 @@
 import java.lang.management.BufferPoolMXBean;
 import java.lang.management.ManagementFactory;
 
-public class PointersBufferPoolMXBean implements BufferPoolMXBean {
+public class PointerBufferPoolMXBean implements BufferPoolMXBean {
 
-    private static final Logger LOGGER = Logger.create(PointersBufferPoolMXBean.class);
-    private static final String POINTERS_MXBEAN_NAME = "pointers";
+    private static final Logger LOGGER = Logger.create(PointerBufferPoolMXBean.class);
+    private static final String JAVACPP_MXBEAN_NAME = "javacpp";
     private static final ObjectName OBJECT_NAME;
 
     static {
         ObjectName objectName = null;
         try {
-            objectName = new ObjectName("java.nio:type=BufferPool,name=" + POINTERS_MXBEAN_NAME);
+            objectName = new ObjectName("java.nio:type=BufferPool,name=" + JAVACPP_MXBEAN_NAME);
         } catch (MalformedObjectNameException e) {
-            LOGGER.warn("Could not create OBJECT_NAME for " + POINTERS_MXBEAN_NAME);
+            LOGGER.warn("Could not create OBJECT_NAME for " + JAVACPP_MXBEAN_NAME);
         }
         OBJECT_NAME = objectName;
     }
 
     @Override
     public String getName() {
-        return POINTERS_MXBEAN_NAME;
+        return JAVACPP_MXBEAN_NAME;
     }
 
     @Override
@@ -50,9 +50,9 @@ public long getMemoryUsed() {
     public static void register() {
         if (OBJECT_NAME != null) {
             try {
-                ManagementFactory.getPlatformMBeanServer().registerMBean(new PointersBufferPoolMXBean(), OBJECT_NAME);
+                ManagementFactory.getPlatformMBeanServer().registerMBean(new PointerBufferPoolMXBean(), OBJECT_NAME);
             } catch (InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException e) {
-                LOGGER.warn("Could not register " + POINTERS_MXBEAN_NAME + " BufferPoolMXBean");
+                LOGGER.warn("Could not register " + JAVACPP_MXBEAN_NAME + " BufferPoolMXBean");
             }
         }
     }