Ensuring JDK 1.8 - JDK 21 support. Class fileformat 52.

jdereg · Nov 1, 2023 · 2735645 · 2735645
1 parent 36b56c0
commit 2735645
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -142,7 +142,7 @@
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
-                    <release>${maven.compiler.release}</release>
+<!--                    <release>${maven.compiler.release}</release>-->
                 </configuration>
             </plugin>
 

diff --git a/src/main/java/com/cedarsoftware/util/ExceptionUtilities.java b/src/main/java/com/cedarsoftware/util/ExceptionUtilities.java
@@ -32,11 +32,6 @@ private ExceptionUtilities() {
      */
     public static void safelyIgnoreException(Throwable t)
     {
-        if (t instanceof ThreadDeath)
-        {
-            throw (ThreadDeath) t;
-        }
-
         if (t instanceof OutOfMemoryError)
         {
             throw (OutOfMemoryError) t;

diff --git a/src/main/java/com/cedarsoftware/util/UniqueIdGenerator.java b/src/main/java/com/cedarsoftware/util/UniqueIdGenerator.java
@@ -40,6 +40,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@SuppressWarnings("unchecked")
 public class UniqueIdGenerator
 {
     public static final String JAVA_UTIL_CLUSTERID = "JAVA_UTIL_CLUSTERID";
@@ -168,7 +169,7 @@ private static long getUniqueIdAttempt()
             previousTimeMilliseconds = currentTimeMilliseconds;
         }
 
-        return currentTimeMilliseconds * 100000 + count * 100 + serverId;
+        return currentTimeMilliseconds * 100000 + count * 100L + serverId;
     }
 
     /**
@@ -221,7 +222,7 @@ private static long getFullUniqueId19()
             previousTimeMilliseconds2 = currentTimeMilliseconds;
         }
 
-        return currentTimeMilliseconds * 1000000 + count2 * 100 + serverId;
+        return currentTimeMilliseconds * 1000000 + count2 * 100L + serverId;
     }
 
     /**

diff --git a/src/main/java/com/cedarsoftware/util/UrlInvocationHandler.java b/src/main/java/com/cedarsoftware/util/UrlInvocationHandler.java
@@ -91,10 +91,6 @@ public Object invoke(Object proxy, Method m, Object[] args) throws Throwable
                 // Get the return value of the call
                 result = _strategy.readResponse(c);
             }
-            catch (ThreadDeath e)
-            {
-                throw e;
-            }
             catch (Throwable e)
             {
                 UrlUtilities.readErrorResponse(c);

diff --git a/src/test/java/com/cedarsoftware/util/TestExceptionUtilities.java b/src/test/java/com/cedarsoftware/util/TestExceptionUtilities.java
@@ -37,19 +37,7 @@ public void testConstructorIsPrivate() throws Exception {
         assertNotNull(con.newInstance());
     }
 
-
-    public void testThreadDeathThrown()
-    {
-        try
-        {
-            ExceptionUtilities.safelyIgnoreException(new ThreadDeath());
-            fail("should not make it here");
-        }
-        catch (ThreadDeath e)
-        {
-        }
-    }
-
+
     public void testOutOfMemoryErrorThrown()
     {
         try

diff --git a/src/test/java/com/cedarsoftware/util/TestReflectionUtils.java b/src/test/java/com/cedarsoftware/util/TestReflectionUtils.java
@@ -186,17 +186,6 @@ public void testMethodAnnotation() throws Exception
         assertNull(a);
     }
 
-    @SuppressWarnings("unchecked")
-    @Test
-    public void testGetDeclaredFields() throws Exception
-    {
-        List fields = mock(ArrayList.class);
-        when(fields.add(any())).thenThrow(ThreadDeath.class);
-
-        assertThatExceptionOfType(ThreadDeath.class)
-                .isThrownBy(() -> ReflectionUtils.getDeclaredFields(Parent.class, fields));
-    }
-
     @Test
     public void testDeepDeclaredFields() throws Exception
     {