josh/gvsu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove debug print of bytesRead, initialize userName to Anonymouse if null

Browse Source 
git-svn-id: svn://anubis/gvsu@55 45c1a28c-8058-47b2-ae61-ca45b979098e
This commit is contained in:
josh 2008-03-09 04:19:34 +00:00
parent 272671701e
commit d7ebcf68d9
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cs654/proj1/KaZaClient.java
View File

@ -19,6 +19,8 @@ public class KaZaClient
String sharedFolder, String server) String sharedFolder, String server)
{ {
m_sharedFolder = sharedFolder; m_sharedFolder = sharedFolder;
if (userName == null || userName.trim().equals(""))
userName = "Anonymous";
try { try {
m_socket = new Socket(server, KaZaServer.LISTEN_PORT); m_socket = new Socket(server, KaZaServer.LISTEN_PORT);
@ -209,7 +211,6 @@ public class KaZaClient
for (;;) for (;;)
{ {
int bytesRead = is.read(buff, 0, buff.length); int bytesRead = is.read(buff, 0, buff.length);
System.out.println("bytesRead: " + bytesRead);
if (bytesRead < 0) if (bytesRead < 0)
break; break;
fos.write(buff, 0, bytesRead); fos.write(buff, 0, bytesRead);

16
cs654/proj1/KaZaServer.java
View File

@ -199,11 +199,19 @@ public class KaZaServer implements Runnable
{ {
synchronized (m_peerGroupLeaders) synchronized (m_peerGroupLeaders)
{ {
for (Socket s : m_peerGroupLeaders) for (int i = 0; i < m_peerGroupLeaders.size(); i++)
{ {
String peerResults = if (m_peerGroupLeaders.elementAt(i).isClosed())
getSearchResultsFromPeerGroupLeader(s, depth-1, query); {
results += peerResults; m_peerGroupLeaders.removeElementAt(i);
i--;
}
else
{
String peerResults =
getSearchResultsFromPeerGroupLeader(s, depth-1, query);
results += peerResults;
}
} }
} }
} }