[jetrix-cvs] SF.net SVN: jetrix:[724] jetrix/trunk/src/java/net/jetrix/agent/QueryAgent. java

[<sm...@us...>]

Revision: 724
          http://jetrix.svn.sourceforge.net/jetrix/?rev=724&view=rev
Author:   smanux
Date:     2008-08-18 14:27:10 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
Fixed QueryAgent on systems with UTF8 as default encoding
Added a connect time out to QueryAgent

Modified Paths:
--------------
    jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java

Modified: jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java	2008-08-13 15:55:33 UTC (rev 723)
+++ jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java	2008-08-18 14:27:10 UTC (rev 724)
@@ -19,10 +19,13 @@
 
 package net.jetrix.agent;
 
-import net.jetrix.Message;
-import net.jetrix.protocols.QueryProtocol;
-
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
@@ -30,8 +33,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import net.jetrix.Message;
+import net.jetrix.protocols.QueryProtocol;
+
 /**
+ * Agent performing query requests on a TetriNET server.
  *
+ * @see <a href="See http://jetrix.sourceforge.net/dev-guide.php#section2-4">Query Protocol Documentation</a>
  *
  * @author Emmanuel Bourg
  * @version $Revision$, $Date$
@@ -48,9 +56,10 @@
     public void connect(String hostname) throws IOException
     {
         this.hostname = hostname;
-        socket = new Socket(hostname, 31457);
-        in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-        out = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
+        socket = new Socket();
+        socket.connect(new InetSocketAddress(hostname, 31457), 5000);
+        in = new BufferedReader(new InputStreamReader(socket.getInputStream(), "ISO-8859-1"));
+        out = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), "ISO-8859-1"));
         socket.setSoTimeout(10000);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.