Skip to content

Commit ed6cb8e

Browse files
committed
Merge pull request #154 from arjantijms/enum_deserialization
2 parents e94c45b + afc0743 commit ed6cb8e

File tree

1 file changed

+9
-4
lines changed
  • orbmain/src/main/java/com/sun/corba/ee/impl/util

1 file changed

+9
-4
lines changed

orbmain/src/main/java/com/sun/corba/ee/impl/util/Utility.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
23
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
34
* Copyright (c) 1998-1999 IBM Corp. All rights reserved.
45
* Copyright (c) 2019 Payara Services Ltd.
@@ -302,10 +303,14 @@ static Class loadClassOfType(String className, String remoteCodebase,
302303
"expected Type.");
303304
}
304305

305-
if (expectedTypeClassLoader != null) {
306-
loadedClass = expectedTypeClassLoader.loadClass(className);
307-
} else {
308-
loadedClass = ORBClassLoader.loadClass(className);
306+
try {
307+
if (expectedTypeClassLoader != null) {
308+
loadedClass = expectedTypeClassLoader.loadClass(className);
309+
} else {
310+
loadedClass = ORBClassLoader.loadClass(className);
311+
}
312+
} catch (ClassNotFoundException e) {
313+
wrapper.classNotFound(className);
309314
}
310315
}
311316

0 commit comments

Comments
 (0)