Changeset 3510

Timestamp:

01/14/10 00:37:20 (7 months ago)

Author:

Maverick

Message:

A number of changes to the code to make sure any file handlers are properly closed after use. This was necessary when TWCore kept crashing after a while for having "Too many files open". See ticket #459.

Location:

trunk/twcore/src/twcore

Files:

• bots/bouncerbot/bouncerbot.java (modified) (2 diffs)
• bots/robohelp/robohelp.java (modified) (2 diffs)
• core/BotSettings.java (modified) (4 diffs)
• core/HubBot.java (modified) (3 diffs)
• core/net/GamePacketInterpreter.java (modified) (1 diff)
• core/OperatorList.java (modified) (2 diffs)
• core/Session.java (modified) (5 diffs)
• core/util/Spy.java (modified) (3 diffs)
• core/util/Tools.java (modified) (4 diffs)

trunk/twcore/src/twcore/bots/bouncerbot/bouncerbot.java

@@ -133 +133 @@
         + c.get( Calendar.MINUTE ) + ":" + c.get( Calendar.SECOND ) + " - ";
         try{
-            PrintWriter out = new PrintWriter( new FileWriter( "bouncerbot.log" ));
+                FileWriter writer = new FileWriter( "bouncerbot.log" );
+            PrintWriter out = new PrintWriter( writer );
             m_log.add( timestamp + event );
             for( Iterator<String> i = m_log.iterator(); i.hasNext(); ){
@@ -139 +140 @@
             }
             out.close();
+            writer.close();
         }catch(Exception e){
             Tools.printStackTrace( e );

trunk/twcore/src/twcore/bots/robohelp/robohelp.java

@@ -209 +209 @@
         rawData = new TreeMap<String, String>();
         try {
-            BufferedReader in = new BufferedReader(new FileReader( m_botAction.getDataFile( "HelpResponses.txt" )));
+                FileReader reader = new FileReader( m_botAction.getDataFile( "HelpResponses.txt" ) );
+            BufferedReader in = new BufferedReader( reader );
             String line;
+            
             int i = 0;
             do{
@@ -225 +227 @@
                         }
                     }
-        } catch( Exception e ){
-            System.out.println( "Error in HelpResponses.txt near: Line " + i );
-        }
-        i++;
+                        } catch( Exception e ){
+                            System.out.println( "Error in HelpResponses.txt near: Line " + i );
+                        }
+                        i++;
             } while( line!=null );
 
-            if( in != null ){
-                in.close();
-            }
+            in.close();
+            reader.close();
         } catch( IOException e ){
             Tools.printStackTrace( e );

trunk/twcore/src/twcore/core/BotSettings.java

@@ -53 +53 @@
             String          value;
             int             equalsIndex;
-            BufferedReader  in = new BufferedReader( new FileReader( file ));
+            FileReader fileReader = new FileReader( file );
+            BufferedReader  in = new BufferedReader( fileReader);
 
             while( (line = in.readLine()) != null ){
@@ -78 +79 @@
 
             in.close();
+            fileReader.close();
         } catch(FileNotFoundException fnfe) {
             Tools.printLog( "BotSettings configuration file ("+file.getName()+") not found: " + fnfe.getMessage());
@@ -248 +250 @@
             String          value;
             int             equalsIndex;
-            BufferedReader  in = new BufferedReader( new FileReader( m_fileName ));
-            PrintWriter     out = new PrintWriter( new BufferedWriter ( new FileWriter(m_fileName + ".tmp")));
+            FileReader reader = new FileReader( m_fileName );
+            BufferedReader  in = new BufferedReader( reader );
+            FileWriter writer = new FileWriter(m_fileName + ".tmp");
+            BufferedWriter bufferWriter = new BufferedWriter( writer );
+            PrintWriter     out = new PrintWriter( bufferWriter );
             HashSet <String> existingKeys = new HashSet<String>();
 
@@ -283 +288 @@
             }
             in.close();
+            reader.close();
+            
             out.close();
+            bufferWriter.close();
+            writer.close();
 
             File f = new File(m_fileName);

trunk/twcore/src/twcore/core/HubBot.java

@@ -132 +132 @@
     private void autoSpawnBots(boolean checkAlreadySpawned) {
         try {
-            BufferedReader reader = new BufferedReader( new FileReader( m_botAction.getCoreCfg( "autoload.cfg" ) ) );
+                FileReader reader = new FileReader( m_botAction.getCoreCfg( "autoload.cfg" ) );
+            BufferedReader buffer = new BufferedReader( reader );
             LinkedHashMap<String, Integer> autoLoads = new LinkedHashMap<String, Integer>();
             // using LinkedHashMap implementation so the order of autoload.cfg is used when spawning bots
@@ -138 +139 @@
             String line = "";
             
-            while( (line = reader.readLine()) != null ){
+            while( (line = buffer.readLine()) != null ){
                 if( line == null || line.length() == 0 ){
                     continue;
@@ -170 +171 @@
                 }
             }
+            
+            buffer.close();
+            reader.close();
         } catch( FileNotFoundException fnfe ){
             Tools.printStackTrace( "File not found: autoload.cfg  ;  ", fnfe );

trunk/twcore/src/twcore/core/net/GamePacketInterpreter.java

@@ -526 +526 @@
         try {
             fileName = message.readString( 1, 16 );
-            BufferedWriter fileWriter = new BufferedWriter( new FileWriter(
-            m_session.getBotAction().getDataFile( fileName )));
-            fileWriter.write( message.readString( 17, message.size() - 17 ) );
-            fileWriter.close();
+            FileWriter writer = new FileWriter(m_session.getBotAction().getDataFile( fileName ));
+            BufferedWriter buffer = new BufferedWriter( writer );
+            buffer.write( message.readString( 17, message.size() - 17 ) );
+            buffer.close();
+            writer.close();
+            
             if( m_requester.check( EventRequester.FILE_ARRIVED )){
                 ByteArray       fileNameArray = new ByteArray( 16 );

trunk/twcore/src/twcore/core/OperatorList.java

@@ -170 +170 @@
                 // Read through the file and add operators
                 try {
-                    BufferedReader br = new BufferedReader(new FileReader(data));
+                        FileReader reader = new FileReader(data);
+                    BufferedReader buffer = new BufferedReader(reader);
                     String line = null, name = null;
                     boolean in_area = false;
 
-                    while (( line = br.readLine()) != null) {
+                    while (( line = buffer.readLine()) != null) {
 
                         if( line.startsWith(" ") ||
@@ -226 +227 @@
                         }
                     }
+                    
+                    buffer.close();
+                    reader.close();
 
                 } catch(FileNotFoundException fnfe) {

trunk/twcore/src/twcore/core/Session.java

@@ -34 +34 @@
     private DatagramSocket  m_socket;
     private PrintWriter         m_chatLog;
+    private FileWriter          m_chatLogWriter;
     private CoreData        m_coreData;
     private String          m_password;
@@ -71 +72 @@
         m_timer = new Timer(name+"-Timer");
         m_chatLog = null;
+        m_chatLogWriter = null;
         m_ipAddress = m_coreData.getServerName();
         m_serverPort = m_coreData.getServerPort();
@@ -89 +91 @@
         m_timer = new Timer(name+"-Timer");
         m_chatLog = null;
+        m_chatLogWriter = null;
         m_ipAddress = altIP;
         m_sysopPassword = altSysop;
@@ -166 +169 @@
                         String filename = m_coreData.getGeneralSettings().getString("Core Location");
                         filename += "/logs/"+ botName + ".log";
-                        m_chatLog = new PrintWriter(new FileWriter(filename, true));
+                        m_chatLogWriter = new FileWriter(filename, true);
+                        m_chatLog = new PrintWriter( m_chatLogWriter );
                 }
 
@@ -270 +274 @@
                 if(m_chatLog != null)
                 {
-                m_chatLog.flush();
-                m_chatLog.close();
+                try {
+                        m_chatLog.flush();
+                m_chatLog.close();
+                                m_chatLogWriter.close();
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                        }
                 }
 

trunk/twcore/src/twcore/core/util/Spy.java

@@ -7 +7 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.io.IOException;
 import java.util.ArrayList;
 
@@ -49 +50 @@
      */
     public void loadConfig () { 
-        BufferedReader sr;
+        FileReader reader = null;
+        BufferedReader sr = null;
         String line;
         boolean loadWords = true;
+        
         try {
-                sr = new BufferedReader(new FileReader(m_botAction.getCoreCfg("racism.cfg")));
+                reader = new FileReader(m_botAction.getCoreCfg("racism.cfg"));
+                sr = new BufferedReader(reader);
+                
                 while((line = sr.readLine()) != null)
                 {
@@ -68 +73 @@
                    }
                 }
-                sr.close();
-                sr = null;
-        }
-                catch (Exception e) {
-                sr = null;
+                
+        } catch (Exception e) {
+                
+                
+        } finally {
+                try {
+                        if(sr != null)
+                                sr.close();
+                        if(reader != null)
+                                reader.close();
+                } catch(IOException ioe) {
+                        Tools.printStackTrace("Unable to close file handlers: "+ioe.getMessage(), ioe);
+                }
         }
         

trunk/twcore/src/twcore/core/util/Tools.java

@@ -185 +185 @@
             if( exceptionLogFilePath == null ) return;
             try{
-                PrintWriter out = new PrintWriter( new BufferedWriter( new FileWriter( exceptionLogFilePath, true )));
+                FileWriter fileWriter = new FileWriter( exceptionLogFilePath, true );
+                BufferedWriter buffer = new BufferedWriter( fileWriter );
+                PrintWriter out = new PrintWriter( buffer );
                 out.println();
                 out.println( "-----------------" );
@@ -191 +193 @@
                 out.println();
                 e.printStackTrace( out );
+                
                 out.close();
+                buffer.close();
+                fileWriter.close();
             } catch( IOException ioe ){
                 ioe.printStackTrace();
@@ -213 +218 @@
             if( exceptionLogFilePath == null ) return;
             try{
-                PrintWriter out = new PrintWriter( new BufferedWriter( new FileWriter( exceptionLogFilePath, true )));
+                FileWriter writer = new FileWriter( exceptionLogFilePath, true );
+                BufferedWriter bufferWriter = new BufferedWriter( writer );
+                PrintWriter out = new PrintWriter( bufferWriter );
+                
+                
                 out.println();
                 out.println( "-----------------" );
@@ -219 +228 @@
                 out.println();
                 e.printStackTrace( out );
+                
+                
                 out.close();
+                bufferWriter.close();
+                writer.close();
             } catch( IOException ioe ){
                 ioe.printStackTrace();