Exclude null viewId from mapped views

Signed-off-by: avpinchuk <alexander.v.pinchuk@gmail.com>
eclipse-ee4j · Oct 25, 2022 · 9667337 · 9667337
1 parent 04a42ea
commit 9667337
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/jsftemplating/src/main/java/com/sun/jsftemplating/layout/LayoutViewHandler.java b/jsftemplating/src/main/java/com/sun/jsftemplating/layout/LayoutViewHandler.java
@@ -133,7 +133,7 @@ public UIViewRoot createView(FacesContext context, String viewId) {
         }
 
         // Check to see if jsftemplating should create the view
-        if (!this.isMappedView(viewId) || viewId == null) {
+        if (!this.isMappedView(viewId)) {
             return  _oldViewHandler.createView(context, viewId);
         }
 
@@ -266,6 +266,9 @@ public UIViewRoot createView(FacesContext context, String viewId) {
      * @since 1.2
      */
     private boolean isMappedView(String viewId) {
+        if (viewId == null) {
+            return false;
+        }
         if (this._viewMappings == null) {
             String initParam = FacesContext.getCurrentInstance().getExternalContext().getInitParameterMap().get(VIEW_MAPPINGS);
             this._viewMappings = SimplePatternMatcher.parseMultiPatternString(initParam, ";");
@@ -612,7 +615,7 @@ public UIViewRoot restoreView(FacesContext context, String viewId) {
         }
 
         // Perform default behavior...
-        if (viewId == null || !isMappedView(viewId)) {
+        if (!isMappedView(viewId)) {
              return _oldViewHandler.restoreView(context, viewId);
         }