[nntprss-commit] nntprss/src/org/methodize/nntprss/nntp NNTPServer.java, 1.12, 1.13

[Jason B. <jas...@us...>]

Update of /cvsroot/nntprss/nntprss/src/org/methodize/nntprss/nntp
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv672/src/org/methodize/nntprss/nntp

Modified Files:
	NNTPServer.java 
Log Message:
Minor updates

Index: NNTPServer.java
===================================================================
RCS file: /cvsroot/nntprss/nntprss/src/org/methodize/nntprss/nntp/NNTPServer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NNTPServer.java	16 Dec 2007 21:49:05 -0000	1.12
--- NNTPServer.java	17 Dec 2007 04:14:39 -0000	1.13
***************
*** 31,47 ****
   * ----------------------------------------------------- */
  
- import java.io.Externalizable;
  import java.io.IOException;
  import java.io.InputStream;
! import java.io.ObjectInput;
! import java.io.ObjectOutput;
! import java.net.InetAddress;
! import java.net.Socket;
! import java.net.SocketException;
! import java.net.UnknownHostException;
! import java.util.Enumeration;
! import java.util.HashMap;
! import java.util.Map;
! import java.util.Properties;
  
  import org.apache.log4j.Logger;
--- 31,38 ----
   * ----------------------------------------------------- */
  
  import java.io.IOException;
  import java.io.InputStream;
! import java.net.*;
! import java.util.*;
  
  import org.apache.log4j.Logger;
***************
*** 60,68 ****
   */
  
! public class NNTPServer implements Externalizable {
  
!     public static final int EXTERNAL_VERSION = 1;
  
!     private Logger log = Logger.getLogger(NNTPServer.class);
  
      private NNTPServerListener listener = null;
--- 51,60 ----
   */
  
! public class NNTPServer {
  
!     private static final Logger log = Logger.getLogger(NNTPServer.class);
  
!     // 30 minute default timeout on NNTP client connections
!     private static final int DEFAULT_CONNECTION_TIMEOUT = 30 * 60 * 1000;
  
      private NNTPServerListener listener = null;
***************
*** 71,79 ****
      private InetAddress address = null;
  
!     private static final int MAX_NNTP_CLIENT_THREADS = 5;
! 
!     // 30 minute default timeout on NNTP client connections
!     private static final int DEFAULT_CONNECTION_TIMEOUT = 30 * 60 * 1000;
! 
      private int contentType = AppConstants.CONTENT_TYPE_MIXED;
      private boolean secure = false;
--- 63,67 ----
      private InetAddress address = null;
  
!     //private static final int MAX_NNTP_CLIENT_THREADS = 5;
      private int contentType = AppConstants.CONTENT_TYPE_MIXED;
      private boolean secure = false;
***************
*** 81,87 ****
      private String hostName = null;
  
!     private ChannelDAO channelDAO;
  
!     private Map users = new HashMap();
  
      public NNTPServer() {
--- 69,75 ----
      private String hostName = null;
  
!     private final ChannelDAO channelDAO;
  
!     private final Map users = new HashMap();
  
      public NNTPServer() {
***************
*** 167,171 ****
  
      public void shutdown() {
!         listener.shutdown();
      }
  
--- 155,161 ----
  
      public void shutdown() {
!     	if(listener != null) {
!     		listener.shutdown();
!     	}
      }
  
***************
*** 258,284 ****
      }
  
-     /* (non-Javadoc)
-      * @see java.io.Externalizable#readExternal(java.io.ObjectInput)
-      */
-     public void readExternal(ObjectInput in)
-         throws IOException, ClassNotFoundException {
- 
-         in.readInt();
-         contentType = in.readInt();
-         secure = in.readBoolean();
-         footnoteUrls = in.readBoolean();
-         hostName = in.readUTF();
-     }
- 
-     /* (non-Javadoc)
-      * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
-      */
-     public void writeExternal(ObjectOutput out) throws IOException {
-         out.writeInt(EXTERNAL_VERSION);
-         out.writeInt(contentType);
-         out.writeBoolean(secure);
-         out.writeBoolean(footnoteUrls);
-         out.writeUTF(hostName != null ? hostName : "");
-     }
- 
  }
--- 248,250 ----