Server: a single connection shutdown function

1 files changed, 11 insertions, 9 deletions

diff --git a/src/Server/Connection.java b/src/Server/Connection.java
index 94853e1..676a65a 100644
--- a/src/Server/Connection.java
+++ b/src/Server/Connection.java
@@ -47,6 +47,15 @@ public class Connection extends Thread
 
 		this.soc = soc;
 	}
+	
+	private void shutdown() 
+	{
+		try
+		{
+			if (!soc.isClosed())
+				soc.close();
+		} catch (IOException e) {}
+	}
 
 	@SuppressWarnings("deprecation")
 	public void run()
@@ -76,7 +85,7 @@ public class Connection extends Thread
 				if (line == null)
 				{
 					System.err.println("Got null line");
-					soc.close();
+					shutdown();
 					break;
 				}
 				parsedLine = new ParsedLine(line);
@@ -90,15 +99,8 @@ public class Connection extends Thread
 			}
 		} catch (IOException e)
 		{
-			if (soc != null)
-				try
-				{
-					soc.close();
-				} catch (IOException e1)
-				{
-					e1.printStackTrace();
-				}
 			e.printStackTrace();
+			shutdown();
 		}
 	}
 }