[pkg-java] r10039 - in trunk/azureus/debian: . patches

[Adrian Perez]

Author: adrianperez-guest
Date: 2009-08-14 16:33:22 +0000 (Fri, 14 Aug 2009)
New Revision: 10039

Added:
   trunk/azureus/debian/patches/upstream-fix-speedtest-npe.patch
Modified:
   trunk/azureus/debian/changelog
   trunk/azureus/debian/patches/series
Log:
* (Upstream-CVS) Fix NullPointerException in Speed Test.
  - Remaining: Validation on the server side prevents it from succeeding.


Modified: trunk/azureus/debian/changelog
===================================================================
--- trunk/azureus/debian/changelog	2009-08-14 16:28:17 UTC (rev 10038)
+++ trunk/azureus/debian/changelog	2009-08-14 16:33:22 UTC (rev 10039)
@@ -1,3 +1,10 @@
+azureus (4.2.0.4-2) UNRELEASED; urgency=low
+
+  * debian/patches/upstream-fix-speedtest-npe.patch:
+    - Import upstream patch to fix broken Speed Test. Closes: #490864.
+
+ -- Adrian Perez <adrianperez.deb at gmail.com>  Thu, 13 Aug 2009 15:03:20 -0400
+
 azureus (4.2.0.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/azureus/debian/patches/series
===================================================================
--- trunk/azureus/debian/patches/series	2009-08-14 16:28:17 UTC (rev 10038)
+++ trunk/azureus/debian/patches/series	2009-08-14 16:33:22 UTC (rev 10039)
@@ -4,3 +4,4 @@
 multiuser.patch
 updater-dont-initialize-swt-updatechecker.patch
 updater-dont-register-core-updatechecker.patch
+upstream-fix-speedtest-npe.patch

Added: trunk/azureus/debian/patches/upstream-fix-speedtest-npe.patch
===================================================================
--- trunk/azureus/debian/patches/upstream-fix-speedtest-npe.patch	                        (rev 0)
+++ trunk/azureus/debian/patches/upstream-fix-speedtest-npe.patch	2009-08-14 16:33:22 UTC (rev 10039)
@@ -0,0 +1,39 @@
+#
+# Origin: http://azureus.cvs.sf.net/viewvc/azureus/azureus2/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminSpeedTestSchedulerImpl.java?r1=1.17&r2=1.18
+# Author: TuxPaper
+# Bug-Debian: http://bugs.debian.org/490864
+# Reviewed-by: Adrian Perez <adrianperez.deb at gmail.com>
+# Last-Update: 2009-11-13
+# Description: Use DefaultInterface in NetwordAdminSpeedTestSchedulerImpl.java
+# to fix a broken "Speed Test".
+#
+Index: azureus-4.2.0.4/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminSpeedTestSchedulerImpl.java
+===================================================================
+--- azureus-4.2.0.4.orig/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminSpeedTestSchedulerImpl.java	2009-08-13 14:33:25.000000000 -0400
++++ azureus-4.2.0.4/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminSpeedTestSchedulerImpl.java	2009-08-13 14:36:46.000000000 -0400
+@@ -25,6 +25,7 @@
+ 
+ import org.gudy.azureus2.core3.util.Debug;
+ import org.gudy.azureus2.plugins.PluginInterface;
++import org.gudy.azureus2.pluginsimpl.local.PluginInitializer;
+ 
+ import com.aelitis.azureus.core.networkmanager.admin.*;
+ 
+@@ -35,8 +36,6 @@
+     private static NetworkAdminSpeedTestSchedulerImpl instance = null;
+     private NetworkAdminSpeedTestScheduledTestImpl currentTest = null;
+ 
+-    private PluginInterface plugin;
+-
+      public static synchronized NetworkAdminSpeedTestScheduler getInstance(){
+         if(instance==null){
+             instance = new NetworkAdminSpeedTestSchedulerImpl();
+@@ -70,6 +69,8 @@
+ 
+     	if ( type == TEST_TYPE_BT ){
+ 
++	PluginInterface plugin = PluginInitializer.getDefaultInterface();
++
+     		currentTest = new NetworkAdminSpeedTestScheduledTestImpl(plugin, new NetworkAdminSpeedTesterBTImpl(plugin) );
+             currentTest.getTester().setMode(type);
+