From f965fb83cfda4e3de3e365f3f94a172730044c22 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 28 Feb 2009 20:47:11 +0000 Subject: [PATCH] fixed NPEs git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15901 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/Functions.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 67bedefb83..58fcfeca68 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -1062,13 +1062,16 @@ public class Functions { */ public Tag findAncestorTag(Map attributes, String nsUri, String local) { Tag tag = (Tag) attributes.get("ownerTag"); - while(tag!=null) { + if(tag==null) return null; + + while(true) { tag = TagSupport.findAncestorWithClass(tag.getParent(), StaplerDynamicTag.class); + if(tag==null) + return null; StaplerDynamicTag stag = (StaplerDynamicTag)tag; if(stag.getLocalName().equals(local) && stag.getNsUri().equals(nsUri)) return tag; } - return null; } private static final Pattern SCHEME = Pattern.compile("[a-z]+://.+"); -- GitLab