[GNUnet-SVN] r24741 - in gnunet-java: . src/org/gnunet/util test/org/gnunet/statistics

[gnunet]

Author: dold
Date: 2012-11-05 15:07:54 +0100 (Mon, 05 Nov 2012)
New Revision: 24741

Modified:
   gnunet-java/build.gradle
   gnunet-java/src/org/gnunet/util/Connection.java
   gnunet-java/test/org/gnunet/statistics/StatisticsTest.java
Log:
fix in build file


Modified: gnunet-java/build.gradle
===================================================================
--- gnunet-java/build.gradle    2012-11-05 14:03:17 UTC (rev 24740)
+++ gnunet-java/build.gradle    2012-11-05 14:07:54 UTC (rev 24741)
@@ -99,19 +99,21 @@
 }
 
 
+project.ext.installerFile = "$projectDir/gnunet-java-installer.jar"
 
 task installer (type: Exec) {
   description "build an IZPack installer for gnunet-java"
   workingDir "$projectDir"
 
-  outputs.file("izpack-installer.jar")
+  outputs.file("$installerFile")
 }
 
+installer.dependsOn "build"
 
 installer.doFirst {
   def izpack = System.getenv("IZPACK_COMPILER")
   if (izpack == null) {
     throw new RuntimeException("environment variable IZPACK_COMPILER not 
defined")
   }
-  installer.commandLine "$izpack", "$projectDir/izpack-installer.xml"
+  installer.commandLine "$izpack", "$projectDir/izpack-installer.xml", "-o", 
"$installerFile"
 }

Modified: gnunet-java/src/org/gnunet/util/Connection.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Connection.java     2012-11-05 14:03:17 UTC 
(rev 24740)
+++ gnunet-java/src/org/gnunet/util/Connection.java     2012-11-05 14:07:54 UTC 
(rev 24741)
@@ -473,7 +473,7 @@
         try {
             connected = channel.finishConnect();
         } catch (IOException e) {
-            logger.error("finishConnect() was not successful: {}", (Object) e);
+            logger.debug("finishConnect() was not successful: {}", (Object) e);
             return;
         }
 
@@ -658,15 +658,11 @@
         }
 
         if (nextTransmitHelper != null) {
-            // todo: do we want the error/warning logging or not?
-            //logger.error("disconnect called, but there is a 
notifyTransmitReady pending");
             nextTransmitHelper.cancel();
             nextTransmitHelper = null;
         }
 
         if (currentReceiveHelper != null) {
-            // todo: same here, want or not?
-            // logger.error("disconnect called, but there is a receive 
pending");
             currentReceiveHelper.cancel();
             currentReceiveHelper = null;
         }

Modified: gnunet-java/test/org/gnunet/statistics/StatisticsTest.java
===================================================================
--- gnunet-java/test/org/gnunet/statistics/StatisticsTest.java  2012-11-05 
14:03:17 UTC (rev 24740)
+++ gnunet-java/test/org/gnunet/statistics/StatisticsTest.java  2012-11-05 
14:07:54 UTC (rev 24741)
@@ -146,7 +146,7 @@
     }
 
 
-    @Test
+    @Test(timeout = 1000)
     public void test_watch_restart() {
         Program.configureLogging("DEBUG");
         final TestingSubsystem ts = new TestingSubsystem("statistics");
@@ -178,7 +178,7 @@
     }
 
 
-    @Test
+    @Test(timeout = 1000)
     public void test_watch_simple() {
         Program.configureLogging("DEBUG");
         final TestingSubsystem ts = new TestingSubsystem("statistics");
@@ -218,7 +218,7 @@
     }
 
 
-    @Test()
+    @Test(timeout = 1000)
     public void test_watch() {
         Program.configureLogging("DEBUG");
         final TestingSubsystem ts = new TestingSubsystem("statistics");