From 80b1b8c5537fa3affce6daecda1c29e575f124c3 Mon Sep 17 00:00:00 2001 From: "dennis.sheirer" Date: Sun, 15 Jun 2014 13:03:16 +0000 Subject: [PATCH] Update to Revision #140 to resolve issue with log file creation resulting from illegal filename characters in the channel name --- src/eventlog/EventLogger.java | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/eventlog/EventLogger.java b/src/eventlog/EventLogger.java index e4380b6c..5baf6475 100644 --- a/src/eventlog/EventLogger.java +++ b/src/eventlog/EventLogger.java @@ -31,12 +31,9 @@ import util.TimeStamp; public abstract class EventLogger { /* Illegal filename characters */ - private static final String[] mIllegalCharacters = { "#", "%", "&", "{", - "}", "\\", "<", ">", - "*", "?", "/", " ", - "$", "!", "'", "\"", - ":", "@", "+", "`", - "|", "=" }; + private static final String[] mIllegalCharacters = + { "#", "%", "&", "{", "}", "\\", "<", ">", "*", "?", "/", + " ", "$", "!", "'", "\"", ":", "@", "+", "`", "|", "=" }; private Path mLogDirectory; private String mFileNameSuffix; @@ -65,7 +62,6 @@ public abstract class EventLogger public void start() { - try { StringBuilder sb = new StringBuilder(); @@ -73,10 +69,10 @@ public abstract class EventLogger sb.append( File.separator ); sb.append( TimeStamp.getTimeStamp( "_" ) ); sb.append( "_" ); - sb.append( mFileNameSuffix ); - - mLogFileName = replaceIllegalCharacters( sb.toString() ); + sb.append( replaceIllegalCharacters( mFileNameSuffix ) ); + mLogFileName = sb.toString(); + Log.info( "Creating log file:" + mLogFileName ); mLogFile = new OutputStreamWriter(new FileOutputStream( mLogFileName ) ); @@ -96,9 +92,9 @@ public abstract class EventLogger { for( String illegalCharacter: mIllegalCharacters ) { - filename.replace( illegalCharacter, "_" ); + filename = filename.replace( illegalCharacter, "_" ); } - + return filename; }