Changeset 1254

Timestamp:

Oct 22, 2010, 2:45:53 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes possible NullPointerException:s that may happen if not all entries have data in the torrent file.

Location:

extensions/net.sf.basedb.torrent/trunk/src/external/hpbtc/hpbtc

Files:

• protocol/torrent/Torrent.java (modified) (2 diffs)
• util/IOUtil.java (modified) (2 diffs)

extensions/net.sf.basedb.torrent/trunk/src/external/hpbtc/hpbtc/protocol/torrent/Torrent.java

@@ -3 +3 @@
 import hpbtc.bencoding.BencodingReader;
 import hpbtc.bencoding.BencodingWriter;
+import hpbtc.util.IOUtil;
 import hpbtc.util.TorrentUtil;
 import java.io.ByteArrayOutputStream;
@@ -83 +84 @@
         }
         if (meta.containsKey("comment".getBytes(byteEncoding))) {
-            comment = new String((byte[]) meta.get("comment".getBytes(
-                    byteEncoding)), byteEncoding);
+            comment = IOUtil.toString((byte[])meta.get("comment".getBytes(byteEncoding)), byteEncoding);
         }
         if (meta.containsKey("created by".getBytes(byteEncoding))) {
-            createdBy = new String((byte[]) meta.get("created by".getBytes(
-                    byteEncoding)), byteEncoding);
+            createdBy = IOUtil.toString((byte[])meta.get("created by".getBytes(byteEncoding)), byteEncoding);
         }
         if (meta.containsKey("encoding".getBytes(byteEncoding))) {
-            encoding = new String((byte[]) meta.get("encoding".getBytes(
-                    byteEncoding)), byteEncoding);
+            encoding = IOUtil.toString((byte[])meta.get("encoding".getBytes(byteEncoding)), byteEncoding);
         }
         final boolean multiple =

extensions/net.sf.basedb.torrent/trunk/src/external/hpbtc/hpbtc/util/IOUtil.java

@@ -8 +8 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
@@ -21 +22 @@
 public class IOUtil {
 
+  
+  public static String toString(byte[] bytes, String encoding)
+    throws UnsupportedEncodingException
+  {
+    return bytes == null ? null : new String(bytes, encoding);
+  }
+
+  
     public static InetSocketAddress getAddress(final SocketChannel c) {
         return (InetSocketAddress) c.socket().getRemoteSocketAddress();