@@ -277,7 +277,7 @@ private void neverEntitled(Class<?> callerClass, Supplier<String> operationDescr
277277 Strings .format (
278278 "component [%s], module [%s], class [%s], operation [%s]" ,
279279 entitlements .componentName (),
280- requestingClass . getModule (). getName ( ),
280+ getModuleName ( requestingClass ),
281281 requestingClass ,
282282 operationDescription .get ()
283283 ),
@@ -395,7 +395,7 @@ public void checkFileRead(Class<?> callerClass, Path path, boolean followLinks)
395395 Strings .format (
396396 "component [%s], module [%s], class [%s], entitlement [file], operation [read], path [%s]" ,
397397 entitlements .componentName (),
398- requestingClass . getModule (). getName ( ),
398+ getModuleName ( requestingClass ),
399399 requestingClass ,
400400 realPath == null ? path : Strings .format ("%s -> %s" , path , realPath )
401401 ),
@@ -425,7 +425,7 @@ public void checkFileWrite(Class<?> callerClass, Path path) {
425425 Strings .format (
426426 "component [%s], module [%s], class [%s], entitlement [file], operation [write], path [%s]" ,
427427 entitlements .componentName (),
428- requestingClass . getModule (). getName ( ),
428+ getModuleName ( requestingClass ),
429429 requestingClass ,
430430 path
431431 ),
@@ -514,7 +514,7 @@ private void checkFlagEntitlement(
514514 Strings .format (
515515 "component [%s], module [%s], class [%s], entitlement [%s]" ,
516516 classEntitlements .componentName (),
517- requestingClass . getModule (). getName ( ),
517+ getModuleName ( requestingClass ),
518518 requestingClass ,
519519 PolicyParser .getEntitlementTypeName (entitlementClass )
520520 ),
@@ -527,7 +527,7 @@ private void checkFlagEntitlement(
527527 () -> Strings .format (
528528 "Entitled: component [%s], module [%s], class [%s], entitlement [%s]" ,
529529 classEntitlements .componentName (),
530- requestingClass . getModule (). getName ( ),
530+ getModuleName ( requestingClass ),
531531 requestingClass ,
532532 PolicyParser .getEntitlementTypeName (entitlementClass )
533533 )
@@ -547,7 +547,7 @@ public void checkWriteProperty(Class<?> callerClass, String property) {
547547 () -> Strings .format (
548548 "Entitled: component [%s], module [%s], class [%s], entitlement [write_system_properties], property [%s]" ,
549549 entitlements .componentName (),
550- requestingClass . getModule (). getName ( ),
550+ getModuleName ( requestingClass ),
551551 requestingClass ,
552552 property
553553 )
@@ -558,7 +558,7 @@ public void checkWriteProperty(Class<?> callerClass, String property) {
558558 Strings .format (
559559 "component [%s], module [%s], class [%s], entitlement [write_system_properties], property [%s]" ,
560560 entitlements .componentName (),
561- requestingClass . getModule (). getName ( ),
561+ getModuleName ( requestingClass ),
562562 requestingClass ,
563563 property
564564 ),
@@ -740,6 +740,14 @@ private static boolean isTriviallyAllowed(Class<?> requestingClass) {
740740 return false ;
741741 }
742742
743+ /**
744+ * @return the {@code requestingClass}'s module name as it would appear in an entitlement policy file
745+ */
746+ private static String getModuleName (Class <?> requestingClass ) {
747+ String name = requestingClass .getModule ().getName ();
748+ return (name == null ) ? ALL_UNNAMED : name ;
749+ }
750+
743751 @ Override
744752 public String toString () {
745753 return "PolicyManager{" + "serverEntitlements=" + serverEntitlements + ", pluginsEntitlements=" + pluginsEntitlements + '}' ;
0 commit comments