Changeset 502

Timestamp:

10/24/13 13:48:01 (11 years ago)

Author:

davidb

Message:

Opportunity taken to break some long lines into a sequence of short ones. A 'silent' catch made to output what the exception was

Location:

trunk

Files:

• releases/Expeditee.jar (modified) ( previous)
• src/org/expeditee/network/FrameServer.java (modified) (1 diff)
• src/org/expeditee/network/FrameShare.java (modified) (4 diffs)

trunk/src/org/expeditee/network/FrameServer.java

@@ -53 +53 @@
                 // figure out response
                 String dString = getFrame(frameName);
-                if (dString == null)
+                if (dString == null) {
                         dString = "";
+                }
 
                 buf = dString.getBytes();

trunk/src/org/expeditee/network/FrameShare.java

@@ -64 +64 @@
                                                 _port = avp.getIntegerValue();
                                         }
+                                        MessageBay.displayMessage("Starting Expeditee Server on port: " + _port);
+                                        
                                         _servers.add(new FrameServer(_port));
                                         _servers.add(new FrameSaver(_port));
@@ -81 +83 @@
 
                         try {
-                                _peers.put(attribute, new Peer(avp));
+                            Peer peer = new Peer(avp);
+                            _peers.put(attribute, peer);
                         } catch (UnknownHostException e) {
                                 MessageBay.errorMessage("Could not locate peer ["
@@ -122 +125 @@
                                         try {
                                                 result = getFrameContents(frameName, socket, peer);
-                                                if(result == null || result.length() == 0)
+                                                if(result == null || result.length() == 0) {
                                                         continue;
-                                                
+                                                }
                                                 peerName = peer.getName();
                                                 break;
@@ -143 +146 @@
                         socket.close();
                 } catch (Exception e) {
-
+                    e.printStackTrace();
                 }