[GNUnet-SVN] r24712 - in gnunet-java/src/org/gnunet: mesh testing

[gnunet]

Author: dold
Date: 2012-11-05 12:23:58 +0100 (Mon, 05 Nov 2012)
New Revision: 24712

Modified:
   gnunet-java/src/org/gnunet/mesh/Mesh.java
   gnunet-java/src/org/gnunet/testing/TestingSubsystem.java
Log:
fixed coverty bugs

Modified: gnunet-java/src/org/gnunet/mesh/Mesh.java
===================================================================
--- gnunet-java/src/org/gnunet/mesh/Mesh.java   2012-11-05 11:19:36 UTC (rev 
24711)
+++ gnunet-java/src/org/gnunet/mesh/Mesh.java   2012-11-05 11:23:58 UTC (rev 
24712)
@@ -47,8 +47,8 @@
     private int[] applications;
     private InboundTunnelHandler inboundTunnelHandler;
 
-    private final int LOCAL_TUNNEL_ID_CLI = 0x80000000;
-    private final int LOCAL_TUNNEL_ID_SERV = 0xB0000000;
+    private final static int LOCAL_TUNNEL_ID_CLI = 0x80000000;
+    private final static int LOCAL_TUNNEL_ID_SERV = 0xB0000000;
 
     private int nextTunnelId = LOCAL_TUNNEL_ID_CLI;
 
@@ -145,7 +145,7 @@
         }
     }
 
-    public class TunnelTransmitRequest extends Request {
+    public static class TunnelTransmitRequest extends Request {
 
         public boolean doNotSend = false;
 
@@ -173,7 +173,7 @@
             Sink s = new Sink();
             transmitter.transmit(s);
 
-            if (tunnel.tunnelId >= LOCAL_TUNNEL_ID_SERV) {
+            if (tunnel.tunnelId >= Mesh.LOCAL_TUNNEL_ID_SERV) {
                 // we are not the origin, thus can only send to origin
                 OriginMessage m = new OriginMessage();
                 m.tid = tunnel.tunnelId;

Modified: gnunet-java/src/org/gnunet/testing/TestingSubsystem.java
===================================================================
--- gnunet-java/src/org/gnunet/testing/TestingSubsystem.java    2012-11-05 
11:19:36 UTC (rev 24711)
+++ gnunet-java/src/org/gnunet/testing/TestingSubsystem.java    2012-11-05 
11:23:58 UTC (rev 24712)
@@ -56,7 +56,7 @@
             throw new TestingSetup.SetupException(e);
         }
 
-        reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+        reader = new BufferedReader(new InputStreamReader(p.getInputStream(), 
Charsets.UTF_8));
 
         writer = new OutputStreamWriter(p.getOutputStream(), Charsets.UTF_8);