Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge jdk-25+7 into rivos/main #211

Open
wants to merge 221 commits into
base: rivos/main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
221 commits
Select commit Hold shift + click to select a range
ea49537
8310340: assert(_thread->is_interp_only_mode() || stub_caller) failed…
pchilano Jan 8, 2025
0a5ef82
8347162: Update problemlist CR for vmTestbase/nsk/jdi/VMOutOfMemoryEx…
plummercj Jan 8, 2025
db7fa6a
8347289: HKDF delayed provider selection failed with non-extractable PRK
wangweij Jan 9, 2025
1ade96b
8347042: Remove an extra parenthesis in macro definition in `jfrTrace…
MaxXSoft Jan 9, 2025
b3e8736
8347296: WinInstallerUiTest fails in local test runs if the path to t…
Jan 9, 2025
0a35ebf
8347297: Skip the RuntimeImageSymbolicLinksTest test on Windows when …
Jan 9, 2025
97dd06c
8347299: Add annotations to test cases in LicenseTest
Jan 9, 2025
a46ae70
8339728: [Accessibility,Windows,JAWS] Bug in the getKeyChar method of…
Jan 9, 2025
8eddf67
8346887: DrawFocusRect() may cause an assertion failure
dmarkov20 Jan 9, 2025
33f9be8
8347083: Incomplete logging in nsk/jvmti/ResourceExhausted/resexhaust…
Jan 9, 2025
82e16ba
8347268: [ubsan] logOutput.cpp:357:21: runtime error: applying non-ze…
MBaesken Jan 9, 2025
dff5719
8347126: gc/stress/TestStressG1Uncommit.java gets OOM-killed
shipilev Jan 9, 2025
d66737e
8341097: GHA: Demote Mac x86 jobs to build only
shipilev Jan 9, 2025
765b9e6
8346706: RISC-V: Add available registers to hs_err
robehn Jan 9, 2025
8c87ea2
8346478: RISC-V: Refactor add/sub assembler routines
RealFYang Jan 9, 2025
ceae2b9
8347121: Add missing @serial tags to module java.base
hns Jan 9, 2025
2801bc6
8346460: NotifyFramePop should return JVMTI_ERROR_DUPLICATE
Jan 9, 2025
3024a73
8345782: Refining the cases that libjsig deprecation warning is issued
jaokim Jan 9, 2025
9c72ded
8346036: Unnecessary Hashtable usage in javax.swing.text.html.parser.…
Jan 9, 2025
f9b1133
8346880: [aix] java/lang/ProcessHandle/InfoTest.java still fails: "re…
Jan 9, 2025
cb9a98b
8347141: Several javac tests compile with an unnecessary -Xlint:-path…
archiecobbs Jan 9, 2025
72f1114
8346705: SNI not sent with Java 22+ using java.net.http.HttpClient.Bu…
jaikiran Jan 9, 2025
1ef77cd
8347171: (dc) java/nio/channels/DatagramChannel/InterruptibleOrNot.ja…
Jan 9, 2025
3bfa952
8283795: Add TLSv1.3 and CNSA 1.0 algorithms to implementation requir…
seanjmullan Jan 9, 2025
22f70a7
8321413: IllegalArgumentException: Code length outside the allowed ra…
slowhog Jan 9, 2025
9f3c5f9
8344907: NullPointerException in Win32ShellFolder2.getSystemIcon when…
Jan 9, 2025
df28cec
8345144: Robot does not specify all causes of IllegalThreadStateExce…
Jan 9, 2025
b335ea9
8347122: Add missing @serial tags to module java.desktop
hns Jan 9, 2025
665c39c
8347375: Extra <p> tag in robot specification
Jan 9, 2025
931914a
8340631: assert(reserved_rgn->contain_region(base_addr, size)) failed…
Jan 9, 2025
89ee1a5
8343978: Update the default value of CodeEntryAlignment for Ampere-1A…
limingliv Jan 9, 2025
a9351df
8346787: Fix two C2 IR matching tests for RISC-V
RealFYang Jan 10, 2025
0210a63
8347379: Problem list failed tests after JDK-8321413
slowhog Jan 10, 2025
f6492aa
8347279: Problemlist TestEvilSyncBug.java#generational
Jan 10, 2025
8b07617
8347345: Remove redundant test policy file from ModelMBeanInfoSupport…
kevinjwalls Jan 10, 2025
1a0fe49
8347256: Epsilon: Demote heap size and AlwaysPreTouch warnings to inf…
shipilev Jan 10, 2025
55c6904
8331717: C2: Crash with SIGFPE Because Loop Predication Wrongly Hoist…
Jan 10, 2025
5e92a4c
8347267: [macOS]: UnixOperatingSystem.c:67:40: runtime error: divisio…
MBaesken Jan 10, 2025
1f45797
8347124: Clean tests with --enable-linkable-runtime
jerboaa Jan 10, 2025
57af52c
8346581: JRadioButton/ButtonGroupFocusTest.java fails in CI on Linux
aivanov-jdk Jan 10, 2025
12752b0
8347346: Remove redundant ClassForName.java and test.policy from runt…
kevinjwalls Jan 10, 2025
ec7393e
8347287: JFR: Remove use of Security Manager
egahlin Jan 10, 2025
c5c4efd
8347120: Launchers should not have java headers on include path
erikj79 Jan 10, 2025
beb0e60
8347397: Cleanup of JDK-8169880
Jan 10, 2025
1bf2f5c
8343510: JFR: Remove AccessControlContext from FlightRecorder::addLis…
egahlin Jan 10, 2025
9cf7d42
8346184: C2: assert(has_node(i)) failed during split thru phi
rwestrel Jan 10, 2025
e7e8f60
8347302: Mark test tools/jimage/JImageToolTest.java as flagless
lmesnik Jan 10, 2025
46ba515
8346669: Increase abstraction in SetupBuildLauncher and remove extra …
magicus Jan 10, 2025
4b554b5
8346722: (fs) Files.probeContentType throws ClassCastException with c…
Jan 10, 2025
d69463e
8347300: Don't exclude the "PATH" var from the environment when runni…
Jan 10, 2025
01c8ba2
8347298: Bug in JPackageCommand.ignoreFakeRuntime()
Jan 10, 2025
10f7142
8347295: Fix WinResourceTest to make it work with WiX v4.0+
Jan 10, 2025
6f1f2f2
8347063: Add comments in ClassFileFormatVersion for class file format…
liach Jan 10, 2025
761774a
8346143: add ClearAllFramePops function to speedup debugger single st…
Jan 10, 2025
3145278
8346727: JvmtiVTMSTransitionDisabler deadlock
Jan 11, 2025
f04a642
8346717: serviceability/dcmd/vm/SystemDumpMapTest.java failing on Win…
Jan 12, 2025
9fafd63
8346828: javax/swing/JScrollBar/4865918/bug4865918.java still fails i…
prsadhuk Jan 13, 2025
1f7925c
8347270: Remove unix_getParentPidAndTimings, unix_getChildren and uni…
MBaesken Jan 13, 2025
b37f123
8347407: [BACKOUT] C1/C2 don't handle allocation failure properly dur…
dafedafe Jan 13, 2025
ed0b555
8344035: Replace predicate walking code in Loop Unswitching with a pr…
chhagedorn Jan 13, 2025
3b9732e
8345471: Clean up compiler/intrinsics/sha/cli tests
djelinski Jan 13, 2025
85ed78c
8345185: Update jpackage to not include service bindings by default
jerboaa Jan 13, 2025
82e2a79
8347006: LoadRangeNode floats above array guard in arraycopy intrinsic
TobiHartmann Jan 13, 2025
450636a
8347274: Gatherers.mapConcurrent exhibits undesired behavior under va…
Jan 13, 2025
0612636
8347373: HTTP/2 flow control checks may count unprocessed data twice
dfuch Jan 13, 2025
c885e59
8346377: Properly support static builds for Windows
magicus Jan 13, 2025
6e43f48
8346929: runtime/ClassUnload/DictionaryDependsTest.java fails with "T…
coleenp Jan 13, 2025
cc19897
8293123: Fix various include file ordering
coleenp Jan 13, 2025
fa5ff82
8342062: Reformat keytool and jarsigner output for keys with a named …
wangweij Jan 13, 2025
cede304
8347482: Remove unused field in ParkEvent
zhengyu123 Jan 13, 2025
a289bcf
8306579: Consider building with /Zc:throwingNew
TheShermanTanker Jan 13, 2025
062f2dc
8347554: [BACKOUT] C2: implement optimization for series of Add of un…
chhagedorn Jan 13, 2025
f67b703
8347427: JTabbedPane/8134116/Bug8134116.java has no license header
aivanov-jdk Jan 13, 2025
a7915bb
8346468: SM cleanup of common test library
Jan 13, 2025
b0c131e
8345368: java/io/File/createTempFile/SpecialTempFile.java fails on Wi…
Jan 13, 2025
e0f2f4b
8313396: Portable implementation of FORBID_C_FUNCTION and ALLOW_C_FUN…
Jan 13, 2025
4e0ffda
8346972: Test java/nio/channels/FileChannel/LoopingTruncate.java fail…
vy Jan 13, 2025
7c883c2
8347605: Use spec tag to refer to IEEE 754 standard
jddarcy Jan 13, 2025
13e1ea5
8346038: [REDO] - [C1] LIR Operations with one input should be implem…
TheRealMDoerr Jan 13, 2025
61dc07c
8346869: [AIX] Add regression test for handling 4 Byte aligned double…
TheRealMDoerr Jan 13, 2025
13a1775
8344146: Remove temporary font file tracking code.
prrace Jan 13, 2025
d3a7ac2
8346383: Cannot use DllMain in libdt_socket for static builds
magicus Jan 13, 2025
379d05b
8346990: Remove INTX_FORMAT and UINTX_FORMAT macros
coleenp Jan 13, 2025
91b63ca
8345016: [ASAN] java.c reported ‘%s’ directive argument is null [-Wer…
Jan 14, 2025
0ae5c6b
8342996: Enhance Attach API to support arbitrary length arguments - OSX
Jan 14, 2025
c1d322f
8347627: Compiler replay tests are failing after JDK-8346990
Jan 14, 2025
6eb83ef
8347500: hsdis cannot be built with Capstone.next
YaSuenag Jan 14, 2025
3967696
8347496: Test jdk/jfr/jvm/TestModularImage.java fails after JDK-83471…
jerboaa Jan 14, 2025
3e989fd
8346986: Remove ASM from java.base
asotona Jan 14, 2025
bb93f67
8347646: module-info classfile missing the preview flag
lahodaj Jan 14, 2025
cbb2b84
8344130: C2: Avoid excessive hoisting in scheduler due to minuscule d…
Jan 14, 2025
fec769b
8346778: Enable native access should work with the source launcher
sormuras Jan 14, 2025
f0af830
8335747: C2: fix overflow case for LoopLimit with constant inputs
eme64 Jan 14, 2025
b4cd3b1
8347566: Replace SSIZE_FORMAT with 'z' length modifier
coleenp Jan 14, 2025
1c64a45
8347501: Make static-launcher fails after JDK-8346669
magicus Jan 14, 2025
56c7800
8347381: Upgrade jQuery UI to version 1.14.1
hns Jan 14, 2025
a49f833
8346045: Cleanup of security library tests calling Security Manager APIs
seanjmullan Jan 14, 2025
dfd215b
8347376: tools/jlink/runtimeImage/JavaSEReproducibleTest.java and Pac…
slowhog Jan 14, 2025
d532019
8347143: [aix] Fix strdup use in os::dll_load
Jan 14, 2025
d002933
8347286: (fs) Remove some extensions from java/nio/file/Files/probeCo…
Jan 14, 2025
a01e92c
8347724: Replace SIZE_FORMAT in jfr directory
coleenp Jan 14, 2025
e6902cf
8323740: java.lang.ExceptionInInitializerError when trying to load XM…
cushon Jan 14, 2025
db76f47
8347720: [BACKOUT] Portable implementation of FORBID_C_FUNCTION and A…
Jan 14, 2025
06ff4c1
8347146: Convert IncludeLocalesPluginTest to use JUnit
naotoj Jan 14, 2025
4c30933
8346971: [ubsan] psCardTable.cpp:131:24: runtime error: large index i…
Jan 14, 2025
2de71d0
8347129: cpuset cgroups controller is required for no good reason
jerboaa Jan 14, 2025
9b1bed0
8290043: serviceability/attach/ConcAttachTest.java failed "guarantee(…
Jan 14, 2025
10d08db
8346142: [perf] scalability issue for the specjvm2008::xml.validation…
Jan 14, 2025
02d2493
8347613: Remove leftover doPrivileged call in Currency test: CheckDat…
Jan 14, 2025
ec2aaaa
8326236: assert(ce != nullptr) failed in Continuation::continuation_b…
pchilano Jan 14, 2025
0ee6ba9
8347596: Update HSS/LMS public key encoding
wangweij Jan 14, 2025
d6d45c6
8303884: jlink --add-options plugin does not allow GNU style options …
slowhog Jan 14, 2025
36b7abd
8225763: Inflater and Deflater should implement AutoCloseable
jaikiran Jan 15, 2025
35be4a4
8347173: java/net/DatagramSocket/InterruptibleDatagramSocket.java fai…
jaikiran Jan 15, 2025
9782bfd
8347620: Shenandoah: Use 'free' tag for free set related logging
Jan 15, 2025
973c630
8342466: Improve API documentation for java.lang.classfile.attribute
liach Jan 15, 2025
be1cdd9
8344140: Refactor the discovery of AOT cache artifacts
iklam Jan 15, 2025
28e01e6
8347762: ClassFile attribute specification refers to non-SE modules
liach Jan 15, 2025
a3be97e
8347761: Test tools/jimage/JImageExtractTest.java fails after JDK-830…
slowhog Jan 15, 2025
afc4529
8346834: Tests failing with -XX:+UseNUMA due to "NUMA support disable…
swati-sha Jan 15, 2025
4f3dc9d
8347352: RISC-V: Cleanup bitwise AND assembler routines
RealFYang Jan 15, 2025
91197b3
8347531: The signal tests are failing after JDK-8345782 due to an unr…
jaokim Jan 15, 2025
af3f5d8
8347039: ThreadPerTaskExecutor terminates if cancelled tasks still ru…
Jan 15, 2025
c36200b
8347721: Replace SIZE_FORMAT in compiler directories
coleenp Jan 15, 2025
d4e5ec2
8346610: Make all imports consistent in the FFM API
minborg Jan 15, 2025
b0e2be6
8347729: Replace SIZE_FORMAT in parallel and serial gc
coleenp Jan 15, 2025
7df21a8
8347597: HttpClient: improve exception reporting when closing connection
dfuch Jan 15, 2025
8193ba3
8347562: javac crash due to type vars in permits clause
SirYwell Jan 15, 2025
254e840
8340416: Remove ArchiveBuilder::estimate_archive_size()
Jan 15, 2025
63cedaf
8347334: JimageDiffGenerator code clean-ups
jerboaa Jan 15, 2025
a0f7982
8345134: Test sun/security/tools/jarsigner/ConciseJarsigner.java fail…
myankelev Jan 15, 2025
4257215
8345493: JFR: JVM.flush hangs intermittently
Jan 15, 2025
a6be907
8347424: Fix and rewrite sun/security/x509/DNSName/LeadingPeriod.java…
shipilev Jan 15, 2025
983e24f
8347727: Replace SIZE_FORMAT in shared gc
coleenp Jan 15, 2025
cfe70eb
8342550: Log warning for using JDK1.1 compatible time zone IDs for fu…
naotoj Jan 15, 2025
764d70b
8344049: Shenandoah: Eliminate init-update-refs safepoint
Jan 15, 2025
bdf6e63
8347431: Update ObjectMonitor comments
coleenp Jan 15, 2025
9c430c9
8336920: ArithmeticException in javax.sound.sampled.AudioInputStream
Jan 16, 2025
d23ad01
8337978: Verify OopHandles oops on access
shipilev Jan 16, 2025
24de9de
8347370: Unnecessary Hashtable usage in javax.swing.text.html.HTML
Jan 16, 2025
4ad5d55
8325030: PhaseMacroExpand::value_from_mem_phi assert with "unknown no…
Jan 16, 2025
f64f22b
8346107: Generators: testing utility for random value generation
Jan 16, 2025
cbe2f96
8347732: Replace SIZE_FORMAT in shenandoah
coleenp Jan 16, 2025
8bfa540
8347731: Replace SIZE_FORMAT in zgc
coleenp Jan 16, 2025
3b6e576
8347825: Make IDEA ide support use proper build system mechanisms
magicus Jan 16, 2025
bfa0cb7
8347730: Replace SIZE_FORMAT in g1
coleenp Jan 16, 2025
788f049
8346607: IGV: Support drag-and-drop for opening graph files
Jan 16, 2025
e7795cc
8347347: Build fails undefined symbol: __asan_init by clang17
Jan 16, 2025
d218b54
8347609: Replace SIZE_FORMAT in os/os_cpu/cpu directories
coleenp Jan 16, 2025
07a0dcb
8347576: Error output in libjsound has non matching format strings
MBaesken Jan 16, 2025
0330ca4
8347617: Shenandoah: Use consistent name for update references phase
Jan 16, 2025
1f365cc
8346433: Cannot use DllMain in hotspot for static builds
magicus Jan 16, 2025
aa21de5
8347481: C2: Remove the control input of some nodes
Jan 17, 2025
398a580
8347911: Limit the length of inflated text chunks
jayathirthrao Jan 17, 2025
a3eef6c
8346875: Test jdk/jdk/jfr/event/os/TestCPULoad.java fails on macOS
MBaesken Jan 17, 2025
f5573f5
8330851: C2: More efficient TypeFunc creation
offamitkumar Jan 17, 2025
8460072
8342881: RISC-V: secondary_super_cache does not scale well: C1 and in…
zifeihan Jan 17, 2025
3ab521e
8347924: Replace SIZE_FORMAT in memory and metaspace
coleenp Jan 17, 2025
15e06b6
8345618: javax/swing/text/Caret/8163124/CaretFloatingPointAPITest.jav…
prsadhuk Jan 17, 2025
2c41f5a
8347959: ThreadDumper leaks memory
zhengyu123 Jan 17, 2025
2ca1b4d
8347840: Fix testlibrary compilation warnings
lmesnik Jan 17, 2025
baca7da
8347733: Replace SIZE_FORMAT in runtime code
coleenp Jan 17, 2025
6cc1c0a
8347422: Crash during safepoint handler execution with -XX:+UseAPX
Jan 17, 2025
17e3df6
8347763: [doc] Add documentation of module options for JEP 483
calvinccheung Jan 17, 2025
6ef860c
8332857: Test vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/Tes…
Jan 18, 2025
e1cf351
8348013: [doc] fix typo in java.md caused by JDK-8347763
calvinccheung Jan 18, 2025
0ff6700
8347987: Bad ifdef in 8330851
robehn Jan 18, 2025
ca8ba5c
8347366: RISC-V: Add extension asserts for CMO instructions
robehn Jan 18, 2025
1f0efc0
8347343: RISC-V: Unchecked zicntr csr reads
robehn Jan 18, 2025
3804082
8346123: [REDO] NMT should not use ThreadCritical
roberttoyonaga Jan 18, 2025
644d154
8347474: Options singleton is used before options are parsed
archiecobbs Jan 19, 2025
e7a1c86
8217914: java/net/httpclient/ConnectTimeoutHandshakeSync.java failed …
vy Jan 20, 2025
4b4b1e9
8347922: Remove runtime/cds/appcds/customLoader/HelloCustom_JFR.java …
Jan 20, 2025
c207cc7
8347923: Parallel: Simplify compute_survivor_space_size_and_threshold
albertnetymk Jan 20, 2025
85fdd2c
8347434: Richer VM operations events logging
shipilev Jan 20, 2025
8a83dc2
8347018: C2: Insertion of Assertion Predicates ignores the effects of…
chhagedorn Jan 20, 2025
3c92392
8348089: Serial: Remove virtual specifier in SerialHeap
albertnetymk Jan 20, 2025
9346984
8347916: Simplify javax.swing.text.html.CSS.LengthUnit.getValue
Jan 20, 2025
0fbf10a
8348038: Docs build failing in Options.notifyListeners with Assertion…
archiecobbs Jan 20, 2025
3a4d5ff
8347996: JavaCompilation.gmk should not include ZipArchive.gmk
magicus Jan 20, 2025
ca863fd
8347758: modules.cpp leaks string returned from get_numbered_property…
zhengyu123 Jan 20, 2025
955bf18
8348040: Bad use of ifdef with INCLUDE_xxx GC macros
Jan 20, 2025
6b91985
8346157: [Ubsan]: runtime error: pointer index expression with base 0…
offamitkumar Jan 21, 2025
0f426e4
8343685: C2 SuperWord: refactor VPointer with MemPointer
eme64 Jan 21, 2025
f54e0bf
8345766: C2 should emit macro nodes for ModF/ModD instead of calls du…
Jan 21, 2025
c33c1cf
8347909: Automatic precompiled.hpp inclusion
stefank Jan 21, 2025
4a9fba6
8347990: Remove SIZE_FORMAT macros and replace remaining uses
coleenp Jan 21, 2025
48c7597
8348029: Make gtest death tests work with real crash signals
tstuefe Jan 21, 2025
5c4a387
8348107: test/jdk/java/net/httpclient/HttpsTunnelAuthTest.java fails …
dfuch Jan 21, 2025
1ed396b
8346927: serviceability/dcmd/vm/[SystemMapTest.java|SystemDumpMapTest…
Jan 21, 2025
8e8c948
8346866: [ASAN] memoryReserver.cpp reported applying non-zero offset …
Jan 21, 2025
a62a870
8347995: Race condition in jdk/java/net/httpclient/offline/FixedRespo…
dfuch Jan 21, 2025
3d4afc4
8345079: Simplify/cleanup Exception handling in RMIConnectionImpl
kevinjwalls Jan 21, 2025
81912e9
8347841: Test fixes that use deprecated time zone IDs
naotoj Jan 21, 2025
6a29a81
8345750: Shenandoah: Test TestJcmdHeapDump.java#aggressive intermitte…
Jan 21, 2025
25fecaa
8348039: testmake fails at IDEA after JDK-8347825
magicus Jan 21, 2025
f2a9d26
8347740: java/io/File/createTempFile/SpecialTempFile.java failing
Jan 21, 2025
c38417a
8348186: C1: Purge fpu_stack_size infrastructure
shipilev Jan 21, 2025
bbd8807
8338428: Add logging of final VM flags while setting properties
lmesnik Jan 21, 2025
7a6ff92
8345543: Test serviceability/jvmti/vthread/StopThreadTest/StopThreadT…
Jan 21, 2025
8458f88
8347475: GTK: javax/swing/JColorChooser/Test8152419.java there are no…
Jan 22, 2025
3c2a1d8
8348117: The two-argument overload of SignatureHandlerLibrary::add is…
Jan 22, 2025
15d6469
8347817: Timeouts running test/jdk/java/lang/String/concat/HiddenClas…
reinrich Jan 22, 2025
d777218
8346830: Simplify adlc build config for aix
MBaesken Jan 22, 2025
9b98cc0
8348182: Remove DONT_USE_PRECOMPILED_HEADER
stefank Jan 22, 2025
46b2481
8335428: Enhanced Building of Processes
Jul 25, 2024
496d06f
8336564: Enhance mask blit functionality redux
jayathirthrao Aug 7, 2024
fa83309
8339180: Enhanced Building of Processes: Follow-on Issue
Sep 18, 2024
5f6c854
8330045: Enhance array handling
chhagedorn Oct 15, 2024
fb43849
8347794: RISC-V: Add Zfhmin - Float cleanup
robehn Jan 22, 2025
6187356
Merge
jaikiran Jan 22, 2025
16dcf15
8348263: C2 SuperWord: TestMemorySegment.java has failing IR rules wi…
eme64 Jan 22, 2025
16a1d0a
8348135: Fix couple of problem listing entries in test/hotspot/jtreg/…
jaikiran Jan 22, 2025
86a8b48
8337458: Remove debugging code print_cpool_bytes
coleenp Jan 22, 2025
1c7641d
8347563: C2: clean up ModRefBarrierSetC2
robcasloz Jan 22, 2025
893d00a
8346388: Cannot use DllMain in libawt for static builds
magicus Jan 22, 2025
25bb698
8348195: More u2 conversion warnings after JDK-8347147
shipilev Jan 22, 2025
17a408c
8348169: Destruct values on free in Treap
jdksjolen Jan 22, 2025
b720517
8348108: Race condition in AggregatePublisher.AggregateSubscription
dfuch Jan 22, 2025
a36e166
8348241: ZGC: Unnecessarily reinitialize ZFragmentationLimit's defaul…
zhengyu123 Jan 23, 2025
8cf0735
8348102: java/net/httpclient/HttpClientSNITest.java fails intermittently
jaikiran Jan 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
8344907: NullPointerException in Win32ShellFolder2.getSystemIcon when…
… "icon" is null

Reviewed-by: aivanov, kizune
  • Loading branch information
Harshitha Onkar committed Jan 9, 2025
commit 9f3c5f95361c75d2b4d9e083901ce5a0ebf355e0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1201,8 +1201,12 @@ public Image getIcon(int width, int height) {
*/
static Image getSystemIcon(SystemIcon iconType) {
long hIcon = getSystemIcon(iconType.getIconID());
if (hIcon == 0) {
return null;
}

Image icon = makeIcon(hIcon);
if (LARGE_ICON_SIZE != icon.getWidth(null)) {
if (icon != null && LARGE_ICON_SIZE != icon.getWidth(null)) {
icon = new MultiResolutionIconImage(LARGE_ICON_SIZE, icon);
}
disposeIcon(hIcon);
@@ -1214,15 +1218,16 @@ static Image getSystemIcon(SystemIcon iconType) {
*/
static Image getShell32Icon(int iconID, int size) {
long hIcon = getIconResource("shell32.dll", iconID, size, size);
if (hIcon != 0) {
Image icon = makeIcon(hIcon);
if (size != icon.getWidth(null)) {
icon = new MultiResolutionIconImage(size, icon);
}
disposeIcon(hIcon);
return icon;
if (hIcon == 0) {
return null;
}
return null;

Image icon = makeIcon(hIcon);
if (icon != null && size != icon.getWidth(null)) {
icon = new MultiResolutionIconImage(size, icon);
}
disposeIcon(hIcon);
return icon;
}

/**