X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Flog4j%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fmisc%2Fenv%2Flog4j%2FLogFileNamer.java;h=35d5038c2875af1e3fe5d85436c072a4f65ccb76;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=85aae6f00a9ff4d7a21d707711a7bb187b3190a3;hpb=82093b06399d9a57cd7e486e9fbeeea9d026cc7c;p=aaf%2Fauthz.git diff --git a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java b/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java index 85aae6f0..35d5038c 100644 --- a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java +++ b/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java @@ -56,24 +56,24 @@ public class LogFileNamer { * @throws IOException */ public String setAppender(String appender) throws IOException { - File f = new File(String.format(FIRST_FILE_FORMAT_STR, dir, root, appender)); - File lock = new File(f.getAbsoluteFile()+".lock"); - if(f.exists()) { - if(lock.exists()) { - int i = 0; - while ((f = new File(String.format(FILE_FORMAT_STR, dir, root, appender, i))).exists() && - (lock = new File(f.getAbsoluteFile()+".lock")).exists()) { - ++i; - } - } - } + File f = new File(String.format(FIRST_FILE_FORMAT_STR, dir, root, appender)); + File lock = new File(f.getAbsoluteFile()+".lock"); + if(f.exists()) { + if(lock.exists()) { + int i = 0; + while ((f = new File(String.format(FILE_FORMAT_STR, dir, root, appender, i))).exists() && + (lock = new File(f.getAbsoluteFile()+".lock")).exists()) { + ++i; + } + } + } try { - lock.createNewFile(); - lock.deleteOnExit(); - f.createNewFile(); + lock.createNewFile(); + lock.deleteOnExit(); + f.createNewFile(); } catch (IOException e) { - throw new IOException("Cannot create file '" + f.getCanonicalPath() + '\'', e); + throw new IOException("Cannot create file '" + f.getCanonicalPath() + '\'', e); } System.setProperty("LOG4J_FILENAME_" + appender, f.getCanonicalPath()); return appender;