[Apt-got-cvs-commits] apt-got/src/com/debianmirror/server MirrorHttpWorkerImpl.java,1.7,1.8 ServerConfig.java,1.11,1.12

[Tobias H. <du...@bt...>]

Update of /var/lib/cvs/apt-got/apt-got/src/com/debianmirror/server
In directory btfmx2:/tmp/cvs-serv32176/src/com/debianmirror/server

Modified Files:
	MirrorHttpWorkerImpl.java ServerConfig.java 
Log Message:
Updating from sourceforge 0.8


Index: ServerConfig.java
===================================================================
RCS file: /var/lib/cvs/apt-got/apt-got/src/com/debianmirror/server/ServerConfig.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ServerConfig.java	2 Jun 2004 01:32:51 -0000	1.11
--- ServerConfig.java	9 Jun 2004 08:01:46 -0000	1.12
***************
*** 97,103 ****
  			System.out.println("ServerConfig.getListeningPort(): threw nfex:\n" + nfex);
  			temp = LISTENINGPORT;
- 		} finally {
- 			return temp;
  		}
  	}
  
--- 97,102 ----
  			System.out.println("ServerConfig.getListeningPort(): threw nfex:\n" + nfex);
  			temp = LISTENINGPORT;
  		}
+ 		return temp;
  	}
  
***************
*** 115,121 ****
  			System.out.println("ServerConfig.getNrOfWorkers(): threw nfex:\n" + nfex);
  			temp = NR_OF_WORKERS;
- 		} finally {
- 			return temp;
  		}
  	}
  	
--- 114,119 ----
  			System.out.println("ServerConfig.getNrOfWorkers(): threw nfex:\n" + nfex);
  			temp = NR_OF_WORKERS;
  		}
+ 		return temp;
  	}
  	

Index: MirrorHttpWorkerImpl.java
===================================================================
RCS file: /var/lib/cvs/apt-got/apt-got/src/com/debianmirror/server/MirrorHttpWorkerImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MirrorHttpWorkerImpl.java	2 Jun 2004 01:32:51 -0000	1.7
--- MirrorHttpWorkerImpl.java	9 Jun 2004 08:01:46 -0000	1.8
***************
*** 187,190 ****
--- 187,196 ----
  			return;
  		}
+ 		InputStream is = mFile.getInputStream();
+ 		if(is == null) {
+ 			logger.fine("InputStream was null");
+ 			sendErrorResponse(404);
+ 			return;
+ 		}
  
  		logger.fine("Creating header from mirror file");
***************
*** 206,210 ****
  				BufferedOutputStream writer = new BufferedOutputStream( socket.getOutputStream() );
  
! 				BufferedInputStream reader = new BufferedInputStream(mFile.getInputStream());
  				try {
  					// Sending single bytes from file to client (very inefficient and not thread safe)
--- 212,216 ----
  				BufferedOutputStream writer = new BufferedOutputStream( socket.getOutputStream() );
  
! 				BufferedInputStream reader = new BufferedInputStream(is);
  				try {
  					// Sending single bytes from file to client (very inefficient and not thread safe)
***************
*** 222,225 ****
--- 228,232 ----
  				} catch(SocketException se) {
  					logger.log(Level.FINE, "Possible abort from client", se);
+ 				} finally {
  					try {
  						writer.close();