removing ThreadLocal references

hansonr · hansonr · commit ec8dfb84d83f · 2019-01-03T13:08:25.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/util/concurrent/ThreadLocalRandom.java b/sources/net.sf.j2s.java.core/src/java/util/concurrent/ThreadLocalRandom.java
@@ -169,8 +169,13 @@ private static long initialSeed() {
     private static final float  FLOAT_UNIT  = 0x1.0p-24f; // 1.0f / (1 << 24)
 
     /** Rarely-used holder for the second of a pair of Gaussians */
-    private static final ThreadLocal<Double> nextLocalGaussian =
-        new ThreadLocal<Double>();
+    private static 
+    //final ThreadLocal<
+    Double
+    //> 
+    nextLocalGaussian 
+    //= new ThreadLocal<Double()>
+    ;
 
     private static long mix64(long z) {
         z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL;
@@ -498,9 +503,9 @@ public float nextFloat() {
 
     public double nextGaussian() {
         // Use nextLocalGaussian instead of nextGaussian field
-        Double d = nextLocalGaussian.get();
+        Double d = nextLocalGaussian;//.get();
         if (d != null) {
-            nextLocalGaussian.set(null);
+            nextLocalGaussian = /*.set*/(null);
             return d.doubleValue();
         }
         double v1, v2, s;
@@ -510,7 +515,7 @@ public double nextGaussian() {
             s = v1 * v1 + v2 * v2;
         } while (s >= 1 || s == 0);
         double multiplier = StrictMath.sqrt(-2 * StrictMath.log(s)/s);
-        nextLocalGaussian.set(new Double(v2 * multiplier));
+        nextLocalGaussian/*.set*/=(new Double(v2 * multiplier));
         return v1 * multiplier;
     }
 
diff --git a/sources/net.sf.j2s.java.core/src/sun/nio/cs/ThreadLocalCoders.java b/sources/net.sf.j2s.java.core/src/sun/nio/cs/ThreadLocalCoders.java
@@ -26,7 +26,9 @@
 
 package sun.nio.cs;
 
-import java.nio.charset.*;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
 
 
 /**
@@ -40,7 +42,10 @@ public class ThreadLocalCoders {
     private static abstract class Cache {
 
         // Thread-local reference to array of cached objects, in LRU order
-        private ThreadLocal<Object[]> cache = new ThreadLocal<>();
+//        private ThreadLocal<Object[]> cache = new ThreadLocal<>();
+        
+        private Object[] cache; 
+        
         private final int size;
 
         Cache(int size) {
@@ -50,7 +55,7 @@ private static abstract class Cache {
         abstract Object create(Object name);
 
         private void moveToFront(Object[] oa, int i) {
-            Object ob = oa[i];
+            Object ob = oa[i];            
             for (int j = i; j > 0; j--)
                 oa[j] = oa[j - 1];
             oa[0] = ob;
@@ -59,10 +64,10 @@ private void moveToFront(Object[] oa, int i) {
         abstract boolean hasName(Object ob, Object name);
 
         Object forName(Object name) {
-            Object[] oa = cache.get();
+            Object[] oa = cache;//.get();
             if (oa == null) {
                 oa = new Object[size];
-                cache.set(oa);
+                cache = oa;//.set(oa);
             } else {
                 for (int i = 0; i < oa.length; i++) {
                     Object ob = oa[i];
diff --git a/sources/net.sf.j2s.java.core/src/test/math/BigDecimal.java b/sources/net.sf.j2s.java.core/src/test/math/BigDecimal.java
@@ -274,13 +274,13 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
     /* Appease the serialization gods */
     private static final long serialVersionUID = 6108874887143696463L;
 
-    private static final ThreadLocal<StringBuilderHelper>
-        threadLocalStringBuilderHelper = new ThreadLocal<StringBuilderHelper>() {
+    private static final /*ThreadLocal<*/StringBuilderHelper/*>*/
+        threadLocalStringBuilderHelper = new /*ThreadLocal<*/StringBuilderHelper/*>*/() /*{
         @Override
         protected StringBuilderHelper initialValue() {
             return new StringBuilderHelper();
         }
-    };
+    }*/;
 
     // Cache of common small BigDecimal values.
     private static final BigDecimal zeroThroughTen[] = {
@@ -3437,7 +3437,7 @@ private String layoutChars(boolean sci) {
                     StringBuilderHelper.DIGIT_ONES[lowInt]) ;
         }
 
-        StringBuilderHelper sbHelper = threadLocalStringBuilderHelper.get();
+        StringBuilderHelper sbHelper = threadLocalStringBuilderHelper;//.get();
         char[] coeff;
         int offset;  // offset is the starting index for coeff array
         // Get the significand as an absolute value
@@ -3465,7 +3465,7 @@ private String layoutChars(boolean sci) {
                 buf.append('.');
                 for (; pad>0; pad--) {
                     buf.append('0');
-                }
+                } 
                 buf.append(coeff, offset, coeffLen);
             } else {                         // xx.xx form
                 buf.append(coeff, offset, -pad);
