[GNUnet-SVN] r21386 - in gnunet-java/src/org/gnunet: dht statistics util

[gnunet]

Author: dold
Date: 2012-05-09 16:18:24 +0200 (Wed, 09 May 2012)
New Revision: 21386

Modified:
   gnunet-java/src/org/gnunet/dht/DistributedHashTable.java
   gnunet-java/src/org/gnunet/statistics/Statistics.java
   gnunet-java/src/org/gnunet/util/RequestQueue.java
Log:
refactoring

Modified: gnunet-java/src/org/gnunet/dht/DistributedHashTable.java
===================================================================
--- gnunet-java/src/org/gnunet/dht/DistributedHashTable.java    2012-05-09 
14:15:43 UTC (rev 21385)
+++ gnunet-java/src/org/gnunet/dht/DistributedHashTable.java    2012-05-09 
14:18:24 UTC (rev 21386)
@@ -209,7 +209,7 @@
 
         @Override
         public void handleError() {
-            throw new AssertionError("unexpected");
+            requestQueue.reconnect();
         }
     }
 

Modified: gnunet-java/src/org/gnunet/statistics/Statistics.java
===================================================================
--- gnunet-java/src/org/gnunet/statistics/Statistics.java       2012-05-09 
14:15:43 UTC (rev 21385)
+++ gnunet-java/src/org/gnunet/statistics/Statistics.java       2012-05-09 
14:18:24 UTC (rev 21386)
@@ -154,6 +154,29 @@
     }
 
 
+    private static class TESTRequest extends RequestQueue.Request {
+        private AbsoluteTime deadline;
+
+        public TESTRequest(AbsoluteTime deadline) {
+            this.deadline = deadline;
+        }
+
+        public boolean onDestroy() {
+            // keep on destroy
+            return true;
+        }
+
+        public AbsoluteTime getDeadline() {
+            return deadline;
+        }
+
+        public void transmit(Connection.MessageSink sink) {
+            sink.send(new TESTMessage());
+            // todo: disconnect when not receiving the TEST message back after 
timeout
+        }
+    }
+
+
     public class StatisticsMessageReceiver extends RunaboutMessageReceiver {
         public void visit(GetResponseMessage m) {
             currentGetReceiver.onReceive(m.subsystemName, m.statisticName, 
m.value);
@@ -276,7 +299,7 @@
      */
     public void destroy() {
         // the request queue handles the destruction, maybe we still have 
important messages pending etc.
-        requestQueue.sendTEST(SET_TIMEOUT.toAbsolute());
+        requestQueue.add(new TESTRequest(SET_TIMEOUT.toAbsolute()));
         requestQueue.shutdown();
     }
 

Modified: gnunet-java/src/org/gnunet/util/RequestQueue.java
===================================================================
--- gnunet-java/src/org/gnunet/util/RequestQueue.java   2012-05-09 14:15:43 UTC 
(rev 21385)
+++ gnunet-java/src/org/gnunet/util/RequestQueue.java   2012-05-09 14:18:24 UTC 
(rev 21386)
@@ -192,35 +192,7 @@
         handleNextTransmit();
     }
 
-
-    private static class TESTRequest extends RequestQueue.Request {
-        private AbsoluteTime deadline;
-
-        public TESTRequest(AbsoluteTime deadline) {
-            this.deadline = deadline;
-        }
-
-        public boolean onDestroy() {
-            // keep on destroy
-            return true;
-        }
-
-        public AbsoluteTime getDeadline() {
-            return deadline;
-        }
-
-        public void transmit(Connection.MessageSink sink) {
-            sink.send(new TESTMessage());
-            // todo: disconnect when not receiving the TEST message back after 
timeout
-        }
-    }
-
-    public void sendTEST(AbsoluteTime deadline) {
-        add(new TESTRequest(deadline));
-    }
-
     public void shutdown() {
-
         final LinkedList<Request> remove = new LinkedList<Request>();
 
         for (Request r : allRequests) {