*) Bugfix for manual peer ping functionality

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@965 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Oct 20, 2005 · af30609 · af30609
1 parent 9879c68
commit af30609
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/htroot/Network.java b/htroot/Network.java
@@ -189,9 +189,14 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
                     prop.put("table_comment_status","publish: disconnected peer '" + peer.getName() + "/" + post.get("peerHash") + "' from " + peer.getAddress());
                 } else {
                     peer = yacyCore.seedDB.getConnected(peer.hash);
-                    prop.put("table_comment",2);
-                    prop.put("table_comment_status","publish: handshaked " + peer.get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_SENIOR) + " peer '" + peer.getName() + "' at " + peer.getAddress());
-                    prop.put("table_comment_details",peer.toString());
+                    if (peer == null) {
+                        prop.put("table_comment",1);
+                        prop.put("table_comment_status","publish: disconnected peer '" + peer.getName() + "/" + post.get("peerHash") + "' from " + peer.getAddress());                     
+                    } else {
+                        prop.put("table_comment",2);
+                        prop.put("table_comment_status","publish: handshaked " + peer.get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_SENIOR) + " peer '" + peer.getName() + "' at " + peer.getAddress());
+                        prop.put("table_comment_details",peer.toString());
+                    }
                 }
 
                 prop.put("table_peerHash",(String) post.get("peerHash"));

diff --git a/source/de/anomic/yacy/yacyPeerActions.java b/source/de/anomic/yacy/yacyPeerActions.java
@@ -282,7 +282,7 @@ synchronized public boolean connectPeer(yacySeed seed, boolean direct) {
             if (Math.abs(nowUTC0Time  - ctimeUTC0) > 3600000) {
                 // the new connection is out-of-age, we reject the connection
                 yacyCore.log.logFine("connect: rejecting out-dated peer '" + seed.getName() + "' from " + seed.getAddress() +
-                                     "; nowUTC0=" + nowUTC0Time + ", seedUTC0=" + ctimeUTC0);
+                                     "; nowUTC0=" + nowUTC0Time + ", seedUTC0=" + ctimeUTC0 + ", TimeDiff=" + serverDate.intervalToString(Math.abs(nowUTC0Time  - ctimeUTC0)));
                 return false;
             }