1 files changed, 11 insertions, 9 deletions

diff --git a/libjava/classpath/gnu/java/security/hash/Whirlpool.java b/libjava/classpath/gnu/java/security/hash/Whirlpool.java
index 89df5c51bf3..aebe1acb699 100644
--- a/libjava/classpath/gnu/java/security/hash/Whirlpool.java
+++ b/libjava/classpath/gnu/java/security/hash/Whirlpool.java
@@ -38,6 +38,8 @@ exception statement from your version.  */
 
 package gnu.java.security.hash;
 
+import gnu.java.lang.CPStringBuilder;
+
 import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
@@ -177,10 +179,10 @@ public final class Whirlpool
         {
           log.fine("Static data");
           log.fine("T0[]:");
-          StringBuilder sb;
+          CPStringBuilder sb;
           for (i = 0; i < 64; i++)
             {
-              sb = new StringBuilder();
+              sb = new CPStringBuilder();
               for (j = 0; j < 4; j++)
                 sb.append("0x").append(Util.toString(T0[i * 4 + j])).append(", ");
 
@@ -189,7 +191,7 @@ public final class Whirlpool
           log.fine("T1[]:");
           for (i = 0; i < 64; i++)
             {
-              sb = new StringBuilder();
+              sb = new CPStringBuilder();
               for (j = 0; j < 4; j++)
                 sb.append("0x").append(Util.toString(T1[i * 4 + j])).append(", ");
 
@@ -198,7 +200,7 @@ public final class Whirlpool
           log.fine("T2[]:");
           for (i = 0; i < 64; i++)
             {
-              sb = new StringBuilder();
+              sb = new CPStringBuilder();
               for (j = 0; j < 4; j++)
                 sb.append("0x").append(Util.toString(T2[i * 4 + j])).append(", ");
 
@@ -207,7 +209,7 @@ public final class Whirlpool
           log.fine("T3[]:");
           for (i = 0; i < 64; i++)
             {
-              sb = new StringBuilder();
+              sb = new CPStringBuilder();
               for (j = 0; j < 4; j++)
                 sb.append("0x").append(Util.toString(T3[i * 4 + j])).append(", ");
 
@@ -216,7 +218,7 @@ public final class Whirlpool
           log.fine("\nT4[]:");
           for (i = 0; i < 64; i++)
             {
-              sb = new StringBuilder();
+              sb = new CPStringBuilder();
               for (j = 0; j < 4; j++)
                 sb.append("0x").append(Util.toString(T4[i * 4 + j])).append(", ");
 
@@ -225,7 +227,7 @@ public final class Whirlpool
           log.fine("T5[]:");
           for (i = 0; i < 64; i++)
             {
-              sb = new StringBuilder();
+              sb = new CPStringBuilder();
               for (j = 0; j < 4; j++)
                 sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
 
@@ -234,7 +236,7 @@ public final class Whirlpool
           log.fine("T6[]:");
           for (i = 0; i < 64; i++)
             {
-              sb = new StringBuilder();
+              sb = new CPStringBuilder();
               for (j = 0; j < 4; j++)
                 sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
 
@@ -243,7 +245,7 @@ public final class Whirlpool
           log.fine("T7[]:");
           for (i = 0; i < 64; i++)
             {
-              sb = new StringBuilder();
+              sb = new CPStringBuilder();
               for (j = 0; j < 4; j++)
                 sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");