From ed2b34add063f439ce742511575e7ff385d295d1 Mon Sep 17 00:00:00 2001
From: LoveIsGrief <loveisgrief@tuta.io>
Date: Mon, 25 Jan 2021 18:32:19 +0100
Subject: [PATCH] Fix net.i2p.util.Addresses::getIP empty string

The standard library behavior is to return the localhost when null or an empty string is passed.
getIP seeked to override that behavior, but didn't treat the empty string case.
---
 core/java/src/net/i2p/util/Addresses.java            | 2 +-
 core/java/test/junit/net/i2p/util/AddressesTest.java | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/java/src/net/i2p/util/Addresses.java b/core/java/src/net/i2p/util/Addresses.java
index ede111298b..7dc9a63592 100644
--- a/core/java/src/net/i2p/util/Addresses.java
+++ b/core/java/src/net/i2p/util/Addresses.java
@@ -399,7 +399,7 @@ public abstract class Addresses {
      *  @since 0.9.3
      */
     public static byte[] getIP(String host) {
-        if (host == null)
+        if (host == null || host.isEmpty())
             return null;
         byte[] rv;
         synchronized (_IPAddress) {
diff --git a/core/java/test/junit/net/i2p/util/AddressesTest.java b/core/java/test/junit/net/i2p/util/AddressesTest.java
index 33abe5dae2..1b4abd7c34 100644
--- a/core/java/test/junit/net/i2p/util/AddressesTest.java
+++ b/core/java/test/junit/net/i2p/util/AddressesTest.java
@@ -19,10 +19,7 @@ public class AddressesTest {
 
     @Test
     public void getIPEmptyString() {
-        byte[] address = {
-            127, 0, 0, 1
-        };
-        assertArrayEquals(address, Addresses.getIP(""));
+        assertNull(Addresses.getIP(""));
     }
 
     @Test