From ffb2494de488b77fd017c04531b103d695909c2f Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Thu, 20 Apr 2023 21:20:08 +0000
Subject: [PATCH] 8305207: Calendar.aggregateStamp(int, int) return value can
 be simplified

Reviewed-by: naoto, rriggs, iris
---
 src/java.base/share/classes/java/util/Calendar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/util/Calendar.java b/src/java.base/share/classes/java/util/Calendar.java
index 0414eebda8e..6e3fa4a561d 100644
--- a/src/java.base/share/classes/java/util/Calendar.java
+++ b/src/java.base/share/classes/java/util/Calendar.java
@@ -2630,7 +2630,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
         if (stamp_a == UNSET || stamp_b == UNSET) {
             return UNSET;
         }
-        return (stamp_a > stamp_b) ? stamp_a : stamp_b;
+        return Math.max(stamp_a, stamp_b);
     }
 
     /**