Fixed sorting inside logging.properties

eclipse-ee4j · Jul 29, 2022 · ccb7735 · ccb7735
1 parent 6b4b1e5
commit ccb7735
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfigImpl.java b/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfigImpl.java
@@ -85,22 +85,16 @@ public class LoggingConfigImpl implements LoggingConfig, PostConstruct {
     @Inject
     FileMonitoring fileMonitoring;
 
-    Properties props = new Properties();
+    LoggingProperties props = new LoggingProperties();
     String loggingPropertiesName;
     File loggingConfigDir = null;
 
-    /**
-     * Constructor
-     */
-
     @Override
     public void postConstruct() {
         // set logging.properties filename
         setupConfigDir(env.getConfigDirPath(), env.getLibPath());
-
     }
 
-    // this is so the launcher can pass in where the dir is since
 
     public void setupConfigDir(File file, File installDir) {
         loggingConfigDir = file;
@@ -112,7 +106,7 @@ public void setupConfigDir(File file, File installDir) {
      * Load the properties for DAS
      */
     private void loadLoggingProperties() throws IOException {
-        props = new Properties();
+        props = new LoggingProperties();
         File file = getLoggingPropertiesFile();
         try (InputStream fis = openPropertyFile(file)) {
             props.load(fis);
@@ -124,7 +118,7 @@ private void loadLoggingProperties() throws IOException {
      * Load the properties for given target.
      */
     private void loadLoggingProperties(String target) throws IOException {
-        props = new Properties();
+        props = new LoggingProperties();
         File file = getLoggingPropertiesFile(target);
         try (InputStream fis = openPropertyFile(file)) {
             props.load(fis);
@@ -296,7 +290,7 @@ public synchronized Map<String, String> updateLoggingProperties(Map<String, Stri
                 setWebLoggers(e.getValue());
             }
 
-            //build Map of entries to return
+            // build Map of entries to return
             m.put(key, property);
 
         }
@@ -674,7 +668,7 @@ public Map<String, String> getDefaultLoggingProperties() throws IOException {
         try {
             File loggingTemplateFile = new File(env.getConfigDirPath(),
                 ServerEnvironmentImpl.kDefaultLoggingPropertiesFileName);
-            fisForLoggingTemplate = new java.io.FileInputStream(loggingTemplateFile);
+            fisForLoggingTemplate = new FileInputStream(loggingTemplateFile);
             propsLoggingTempleate.load(fisForLoggingTemplate);
         } finally {
             safeCloseStream(fisForLoggingTemplate);