Showing
1 changed file
with
5 additions
and
6 deletions
| @@ -5,11 +5,7 @@ import javax.faces.component.UIComponentBase; | @@ -5,11 +5,7 @@ import javax.faces.component.UIComponentBase; | ||
| 5 | import javax.faces.component.UIForm; | 5 | import javax.faces.component.UIForm; |
| 6 | import javax.faces.component.UIInput; | 6 | import javax.faces.component.UIInput; |
| 7 | import javax.faces.context.FacesContext; | 7 | import javax.faces.context.FacesContext; |
| 8 | -import java.util.ArrayList; | ||
| 9 | -import java.util.HashSet; | ||
| 10 | -import java.util.Iterator; | ||
| 11 | -import java.util.List; | ||
| 12 | -import java.util.Set; | 8 | +import java.util.*; |
| 13 | 9 | ||
| 14 | public abstract class UIFocus extends UIComponentBase { | 10 | public abstract class UIFocus extends UIComponentBase { |
| 15 | // ------------------------------ FIELDS ------------------------------ | 11 | // ------------------------------ FIELDS ------------------------------ |
| @@ -80,7 +76,10 @@ public abstract class UIFocus extends UIComponentBase { | @@ -80,7 +76,10 @@ public abstract class UIFocus extends UIComponentBase { | ||
| 80 | Set<String> allowedClientIds = new HashSet<String>(); | 76 | Set<String> allowedClientIds = new HashSet<String>(); |
| 81 | Iterator<String> clientIdsWithMessages = getFacesContext().getClientIdsWithMessages(); | 77 | Iterator<String> clientIdsWithMessages = getFacesContext().getClientIdsWithMessages(); |
| 82 | while (clientIdsWithMessages.hasNext()) { | 78 | while (clientIdsWithMessages.hasNext()) { |
| 83 | - allowedClientIds.add(clientIdsWithMessages.next()); | 79 | + final String clientId = clientIdsWithMessages.next(); |
| 80 | + if (clientId != null) { | ||
| 81 | + allowedClientIds.add(clientId); | ||
| 82 | + } | ||
| 84 | } | 83 | } |
| 85 | final List<UIInput> inputs = new ArrayList<UIInput>(); | 84 | final List<UIInput> inputs = new ArrayList<UIInput>(); |
| 86 | getInputs(getParentForm(this), allowedClientIds, inputs); | 85 | getInputs(getParentForm(this), allowedClientIds, inputs); |
Please
register
or
login
to post a comment