sun.security.util.Debug : Allow compile time initialization.
bug: 27265238
Change-Id: Idfe4065b1005c11f9e6f44e50ac3b058fb7440c0
diff --git a/ojluni/src/main/java/sun/security/util/Debug.java b/ojluni/src/main/java/sun/security/util/Debug.java
index 5701a80..f1d2bd0 100755
--- a/ojluni/src/main/java/sun/security/util/Debug.java
+++ b/ojluni/src/main/java/sun/security/util/Debug.java
@@ -26,9 +26,9 @@
package sun.security.util;
import java.math.BigInteger;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* A utility class for debuging.
@@ -37,36 +37,18 @@
*/
public class Debug {
- private String prefix;
+ private static final String args = null;
- private static String args;
+ private final String prefix;
- static {
- args = java.security.AccessController.doPrivileged
- (new sun.security.action.GetPropertyAction
- ("java.security.debug"));
-
- String args2 = java.security.AccessController.doPrivileged
- (new sun.security.action.GetPropertyAction
- ("java.security.auth.debug"));
-
- if (args == null) {
- args = args2;
- } else {
- if (args2 != null)
- args = args + "," + args2;
- }
-
- if (args != null) {
- args = marshal(args);
- if (args.equals("help")) {
- Help();
- }
- }
+ private Debug(String prefix) {
+ this.prefix = prefix;
}
- public static void Help()
- {
+ /*
+ From public static void Help() : Serves as a documentation of the
+ values that "args" accepts.
+
System.err.println();
System.err.println("all turn on all debugging");
System.err.println("access print all checkPermission results");
@@ -100,8 +82,7 @@
System.err.println();
System.err.println("Note: Separate multiple options with a comma");
System.exit(0);
- }
-
+ */
/**
* Get a Debug object corresponding to whether or not the given
@@ -120,8 +101,7 @@
public static Debug getInstance(String option, String prefix)
{
if (isOn(option)) {
- Debug d = new Debug();
- d.prefix = prefix;
+ Debug d = new Debug(prefix);
return d;
} else {
return null;
@@ -163,14 +143,6 @@
System.err.println(prefix + ":");
}
- /**
- * print a message to stderr that is prefixed with the prefix.
- */
-
- public static void println(String prefix, String message)
- {
- System.err.println(prefix + ": "+message);
- }
/**
* return a hexadecimal printed representation of the specified