From 8939d92af2f4fbe193d29fbee2f62ccbbab60910 Mon Sep 17 00:00:00 2001
From: yittian <yi_zhou@hust.edu.cn>
Date: Sun, 23 Apr 2023 08:40:22 +0000
Subject: [PATCH] Backport of JDK-8305207: Calendar.aggregateStamp(int, int)
 return value can be simplified

Signed-off-by: yittian <yi_zhou@hust.edu.cn>
---
 jdk/src/share/classes/java/util/Calendar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/java/util/Calendar.java b/jdk/src/share/classes/java/util/Calendar.java
index 1308b04a2..4df976a36 100644
--- a/jdk/src/share/classes/java/util/Calendar.java
+++ b/jdk/src/share/classes/java/util/Calendar.java
@@ -2602,7 +2602,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);
     }
 
     /**
-- 
Gitee