From 956e8483f53e4228aa84b93199356f16189aa3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Mon, 8 Mar 2021 23:19:55 -0500
Subject: [PATCH] Dont quote realm if it's null in Credentials.toString

---
 .../sbt/librarymanagement/ivy/Credentials.scala      |  8 +++++++-
 .../internal/librarymanagement/CredentialsSpec.scala | 12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala b/ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala
index df8614525..ef2766480 100644
--- a/ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala
+++ b/ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala
@@ -88,5 +88,11 @@ final class DirectCredentials(
     val userName: String,
     val passwd: String
 ) extends Credentials {
-  override def toString = s"""DirectCredentials("$realm", "$host", "$userName", ****)"""
+  override def toString = {
+    val dq = '"'
+    val r =
+      if (realm == null) "null"
+      else dq + realm + dq
+    s"""DirectCredentials($r, "$host", "$userName", ****)"""
+  }
 }
diff --git a/ivy/src/test/scala/sbt/internal/librarymanagement/CredentialsSpec.scala b/ivy/src/test/scala/sbt/internal/librarymanagement/CredentialsSpec.scala
index 7c2386cb8..e546f9758 100644
--- a/ivy/src/test/scala/sbt/internal/librarymanagement/CredentialsSpec.scala
+++ b/ivy/src/test/scala/sbt/internal/librarymanagement/CredentialsSpec.scala
@@ -25,4 +25,16 @@ class CredentialsSpec extends AnyFunSuite {
 
     credentialsFile.delete()
   }
+
+  test("DirectCredentials.toString") {
+    assert(
+      Credentials(realm = null, host = "example.org", userName = "username", passwd = "password").toString ==
+        """DirectCredentials(null, "example.org", "username", ****)"""
+    )
+
+    assert(
+      Credentials(realm = "realm", host = "example.org", userName = "username", passwd = "password").toString ==
+        """DirectCredentials("realm", "example.org", "username", ****)"""
+    )
+  }
 }