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 2023/11/30 20:12:44 UTC
(commons-crypto) branch master updated: Fetch the debug setting once [skip ci]
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/master by this push:
new c2eb4c16 Fetch the debug setting once [skip ci]
c2eb4c16 is described below
commit c2eb4c16bf217d9cb57464cf20e990a024d3799f
Author: Sebb <se...@apache.org>
AuthorDate: Thu Nov 30 20:12:38 2023 +0000
Fetch the debug setting once [skip ci]
---
src/main/java/org/apache/commons/crypto/Crypto.java | 2 ++
src/main/java/org/apache/commons/crypto/NativeCodeLoader.java | 9 ++-------
src/main/java/org/apache/commons/crypto/jna/OpenSslJna.java | 5 +----
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/crypto/Crypto.java b/src/main/java/org/apache/commons/crypto/Crypto.java
index 2facf3f1..f633f5fb 100644
--- a/src/main/java/org/apache/commons/crypto/Crypto.java
+++ b/src/main/java/org/apache/commons/crypto/Crypto.java
@@ -112,6 +112,8 @@ public final class Crypto {
*/
public static final String MACOS_LIBRARY_NAME_DEFAULT = "libcrypto.dylib";
+ public static final boolean IS_DEBUG = Boolean.getBoolean(Crypto.CONF_PREFIX + "debug");
+
private static boolean quiet;
/**
diff --git a/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java b/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
index 32ea9253..51425a70 100644
--- a/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
+++ b/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
@@ -65,8 +65,7 @@ final class NativeCodeLoader {
* @param args See {@link String#format(String, Object...)}.
*/
private static void debug(final String format, final Object... args) {
- // TODO Find a better way to do this later.
- if (isDebug()) {
+ if (Crypto.IS_DEBUG) {
System.out.println(String.format(format, args));
if (args != null && args.length > 0 && args[0] instanceof Throwable) {
((Throwable) args[0]).printStackTrace(System.out);
@@ -103,7 +102,7 @@ final class NativeCodeLoader {
try {
path = extractedLibFile.toPath();
final long byteCount = Files.copy(inputStream, path, StandardCopyOption.REPLACE_EXISTING);
- if (isDebug()) {
+ if (Crypto.IS_DEBUG) {
debug("Extracted '%s' to '%s': %,d bytes [%s]", nativeLibraryFilePath, extractedLibFile, byteCount,
Files.isExecutable(path) ? "X+" : "X-");
try {
@@ -218,10 +217,6 @@ final class NativeCodeLoader {
return NativeCodeLoader.class.getResource(path) != null;
}
- private static boolean isDebug() {
- return Boolean.getBoolean(Crypto.CONF_PREFIX + "debug");
- }
-
/**
* Checks whether native code is loaded for this platform.
*
diff --git a/src/main/java/org/apache/commons/crypto/jna/OpenSslJna.java b/src/main/java/org/apache/commons/crypto/jna/OpenSslJna.java
index 4906b117..bccfe827 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSslJna.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSslJna.java
@@ -28,8 +28,6 @@ import org.apache.commons.crypto.utils.Utils;
*/
public final class OpenSslJna {
- private final static String KEY_DEBUG = Crypto.CONF_PREFIX + "debug";
-
/**
* Logs debug messages.
*
@@ -37,8 +35,7 @@ public final class OpenSslJna {
* @param args See {@link String#format(String, Object...)}.
*/
static void debug(final Object format, final Object... args) {
- // TODO Find a better way to do this later.
- if (Boolean.getBoolean(KEY_DEBUG)) {
+ if (Crypto.IS_DEBUG) {
System.out.println(String.format(Objects.toString(format), args));
}
}