Changeset 751

Timestamp:

01/24/14 16:44:53 (10 years ago)

Author:

jts21

Message:

Fix NullPointerException in FrameShare

File:

• trunk/src/org/expeditee/network/FrameShare.java (modified) (1 diff)

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

@@ -326 +326 @@
                         byte[] contentsBuf = frameset.getBytes();
                         Peer peer = _peers.get(peerName.toLowerCase());
-                        try {
-                                // send inf request
-                                DatagramPacket packet = new DatagramPacket(
-                                                contentsBuf,
-                                                contentsBuf.length,
-                                                peer.getAddress(),
-                                                peer.getPort()
-                                                                + (update ? InfUpdate.OFFSET : InfServer.OFFSET));
-                                socket.send(packet);
-
-                                byte[] buf = new byte[100];
-                                // get response
-                                packet = new DatagramPacket(buf, buf.length);
-                                socket.receive(packet);
-
-                                // store frame contents
-                                result = Integer.parseInt(new String(packet.getData(), 0,
-                                                packet.getLength()));
-                                peerName = peer.getName();
-
-                        } catch (Exception e) {
-                                e.printStackTrace();
+                        if(peer != null) {
+                        try {
+                                // send inf request
+                                DatagramPacket packet = new DatagramPacket(
+                                                contentsBuf,
+                                                contentsBuf.length,
+                                                peer.getAddress(),
+                                                peer.getPort()
+                                                                + (update ? InfUpdate.OFFSET : InfServer.OFFSET));
+                                socket.send(packet);
+    
+                                byte[] buf = new byte[100];
+                                // get response
+                                packet = new DatagramPacket(buf, buf.length);
+                                socket.receive(packet);
+    
+                                // store frame contents
+                                result = Integer.parseInt(new String(packet.getData(), 0,
+                                                packet.getLength()));
+                                peerName = peer.getName();
+    
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                        }
                         }
                         socket.close();