Changeset 1251

Timestamp:

Oct 22, 2010, 8:25:01 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

The torrent service is now also creating a Bittorrent Client in it's start() method and closing it in the stop() method.

Location:

extensions/net.sf.basedb.torrent/trunk

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (3 diffs)
• src/main/net/sf/basedb/clients/torrent/service/TorrentService.java (modified) (5 diffs)

extensions/net.sf.basedb.torrent/trunk/.classpath

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+  <classpathentry kind="src" path="src/main"/>
   <classpathentry kind="src" path="src/external/hpbtc"/>
-  <classpathentry kind="src" path="src/main"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
   <classpathentry kind="lib" path="lib/compile/BASE2Core.jar"/>

extensions/net.sf.basedb.torrent/trunk/build.xml

@@ -49 +49 @@
 
   <!-- set up classpath for compiling -->
-  <path id="classpath">
+  <path id="external.classpath">
     <fileset dir="lib">
       <include name="**/*.jar" />
     </fileset>
+  </path>
+
+  <path id="classpath">
+    <path refid="external.classpath" />
+    <pathelement location="${build}/external/hpbtc" />
   </path>
 
@@ -82 +87 @@
         prefix="${tar.prefix}"
         preserveLeadingSlashes="true"
-        includes="${jar.name},README,LICENSE*,lib/torrent/*"
+        includes="${jar.name},README,LICENSE*,torrent.properties,lib/torrent/*"
       />
     </tar>
@@ -140 +145 @@
       destdir="${build}/external/hpbtc" 
       debug="true" 
-      classpathref="classpath"
+      classpathref="external.classpath"
       encoding="${javac.encoding}" 
       source="${javac.source}"

extensions/net.sf.basedb.torrent/trunk/src/main/net/sf/basedb/clients/torrent/service/TorrentService.java

@@ -25 +25 @@
 
 
+import hpbtc.protocol.processor.Client;
+
+import java.io.IOException;
 import java.util.Properties;
 
@@ -83 +86 @@
   private final java.io.File workDir;
   private final int port;
-  private boolean isRunning;
+  private volatile boolean isRunning;
+  private Client btClient;
   
   /**
@@ -110 +114 @@
     Starts the core service if it is not already running.
   */
-  public void start()
+  public synchronized void start()
   {
     if (isRunning()) return;
@@ -128 +132 @@
     }
     
+      // Start bittorrent service
+      Client tmpClient = null;
+      try
+      {
+        tmpClient = new Client();
+        tmpClient.startProtocol(port);
+      }
+      catch (IOException ex)
+      {
+        log.error("Could not start bittorrent client", ex);
+        throw new RuntimeException(ex);
+      }
+      
+      btClient = tmpClient;
+      
     isRunning = true;
     log.info("Bittorrent Download Service has been started");
@@ -136 +155 @@
     must be created by calling {@link #getInstance(Properties)}.
   */
-  public void stop()
+  public synchronized void stop()
   {
     if (!isRunning()) return;
     log.info("Stopping Bittorrent Download Service");
-    isRunning = false;
-    service = null;
-    log.info("Bittorrent Download Service has been stopped");
+    
+    try
+    {
+      if (btClient != null)
+      {
+        btClient.stopProtocol();
+        btClient = null;
+      }
+    }
+    finally
+    {
+      isRunning = false;
+      service = null;
+      log.info("Bittorrent Download Service has been stopped");
+    }
   }