@@ -320,7 +320,7 @@ public synchronized boolean lock(Set<LockableResource> resources,
320
320
private synchronized void freeResources (List <String > unlockResourceNames , @ Nullable Run <?, ?> build ) {
321
321
for (String unlockResourceName : unlockResourceNames ) {
322
322
for (LockableResource resource : this .resources ) {
323
- if (resource .getName ().equals (unlockResourceName )) {
323
+ if (resource != null && resource . getName () != null && resource .getName ().equals (unlockResourceName )) {
324
324
if (build == null || (resource .getBuild () != null && build .getExternalizableId ().equals (resource .getBuild ().getExternalizableId ()))) {
325
325
// No more contexts, unlock resource
326
326
resource .unqueue ();
@@ -481,21 +481,25 @@ private QueuedContextStruct getNextQueuedContext(List<String> resourceNamesToUnL
481
481
* Creates the resource if it does not exist.
482
482
*/
483
483
public synchronized boolean createResource (String name ) {
484
- LockableResource existent = fromName (name );
485
- if (existent == null ) {
486
- getResources ().add (new LockableResource (name ));
487
- save ();
488
- return true ;
484
+ if (name != null ) {
485
+ LockableResource existent = fromName (name );
486
+ if (existent == null ) {
487
+ getResources ().add (new LockableResource (name ));
488
+ save ();
489
+ return true ;
490
+ }
489
491
}
490
492
return false ;
491
493
}
492
494
493
495
public synchronized boolean createResourceWithLabel (String name , String label ) {
494
- LockableResource existent = fromName (name );
495
- if (existent == null ) {
496
- getResources ().add (new LockableResource (name , "" , label , null ));
497
- save ();
498
- return true ;
496
+ if (name !=null && label !=null ) {
497
+ LockableResource existent = fromName (name );
498
+ if (existent == null ) {
499
+ getResources ().add (new LockableResource (name , "" , label , null ));
500
+ save ();
501
+ return true ;
502
+ }
499
503
}
500
504
return false ;
501
505
}
0 commit comments