Skip to content

Commit a64a310

Browse files
author
Krypteria
committed
Server receive bug solved
1 parent 48d8bf5 commit a64a310

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/Model/Server.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ private void processHeader(Socket clientSocket, String header) throws ServerRunT
198198

199199
this.totalFileSize = Long.parseLong(headerInfo.nextLine());
200200
generalFileName = headerInfo.nextLine();
201-
System.out.println(header);
202201

203202
this.notifyAddToTransferenceObservers(generalFileName, src_addr);
204203
while(headerInfo.hasNextLine()){
@@ -239,7 +238,6 @@ else if(fileInfo.charAt(0) == 'F'){ //File
239238

240239
private void receiveFile(Socket clientSocket, String filePath, Long fileSize) throws ServerRunTimeException{
241240
try{
242-
System.out.println(filePath + " " + fileSize);
243241
filePath.replace("\\", "\\\\");
244242
this.output = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(new File(filePath))));
245243

@@ -257,18 +255,18 @@ private void receiveFile(Socket clientSocket, String filePath, Long fileSize) th
257255
while(integerFileSizeValue > 0 && (bytesReaded = this.input.read(this.buffer, 0, Math.min(this.BUFFERSIZE, integerFileSizeValue))) >= 0){
258256
this.output.write(this.buffer, 0, bytesReaded);
259257
this.output.flush();
260-
//System.out.println(bytesReaded);
261258
fileSize -= bytesReaded;
262259

263260
totalBytesReaded += bytesReaded;
264261
if(integerMaxValueExceeded && fileSize < Integer.MAX_VALUE){
265262
integerFileSizeValue = Math.toIntExact(fileSize);
266263
integerMaxValueExceeded = false;
267264
}
268-
System.out.println(filePath + " " +integerFileSizeValue);
265+
else if(!integerMaxValueExceeded){
266+
integerFileSizeValue -= bytesReaded;
267+
}
269268
this.notifyUpdateToTransferenceObservers(this.getProgress(totalBytesReaded), clientSocket.getInetAddress().toString().substring(1));
270269
}
271-
//System.out.println(bytesReaded);
272270
}
273271
catch(FileNotFoundException e){
274272
this.notifyRemoveToTransferenceObservers(clientSocket.getInetAddress().toString().substring(1));
@@ -333,7 +331,6 @@ private void notifyRemoveToTransferenceObservers(String src_addr){
333331
}
334332

335333
private void notifyException(String message){
336-
System.out.println("entro por aquí");
337334
for(TransferencesObserver observer : this.transferenceObserversList){
338335
observer.notifyException(message);
339336
}

0 commit comments

Comments
 (0)