[2.3.x] Further Mapper changes for Servlet 4.0 support. Patch provided by edburns 'at' java.net.

Author: rlubke

Diff for: modules/http-server/src/main/java/org/glassfish/grizzly/http/server/util/Mapper.java

@@ -1132,6 +1132,7 @@ private void internalMapWrapper(Context context, CharChunk path,
                 mappingData.pathInfo.setString("/");
                 mappingData.mappingType = MappingData.CONTEXT_ROOT;
                 mappingData.descriptorPath = "/";
+                mappingData.matchedPath = "/";
             }
         }
 
@@ -1277,6 +1278,7 @@ private void internalMapWrapper(Context context, CharChunk path,
                                 mappingData.wrapperPath.setString(pathStr);
                                 mappingData.mappingType = MappingData.DEFAULT;
                                 mappingData.descriptorPath = "/";
+                                mappingData.matchedPath = "/";
                             }
                         }
                     }
@@ -1331,8 +1333,9 @@ private void internalMapWrapper(Context context, CharChunk path,
                     (path.getBuffer(), path.getStart(), path.getEnd());
                 mappingData.wrapperPath.setChars
                     (path.getBuffer(), path.getStart(), path.getEnd());
-                mappingData.mappingType = MappingData.DEFAULT;
+                mappingData.mappingType = MappingData.CONTEXT_ROOT;
                 mappingData.descriptorPath = "/";
+                mappingData.matchedPath = "/";
             }
             // Redirection to a folder
             char[] buf = path.getBuffer();
@@ -1399,8 +1402,12 @@ private void internalMapWrapper(Context context, CharChunk path,
             mappingData.wrapperPath.setString(wrappers[pos].name);
             mappingData.wrapper = wrappers[pos].object;
             mappingData.servletName = wrappers[pos].servletName;
-            mappingData.mappingType = MappingData.EXACT;
             mappingData.descriptorPath = wrappers[pos].path;
+            mappingData.matchedPath = path.toString();
+            mappingData.mappingType =
+                    (("/".equals(mappingData.matchedPath))
+                            ? MappingData.DEFAULT
+                            : MappingData.EXACT);
         }
     }
 
@@ -1454,6 +1461,7 @@ private void internalMapWrapper(Context context, CharChunk path,
                 mappingData.jspWildCard = wrappers[pos].jspWildCard;
                 mappingData.mappingType = MappingData.PATH;
                 mappingData.descriptorPath = wrappers[pos].path;
+                mappingData.matchedPath = path.toString();
             }
         }
     }
@@ -1499,6 +1507,7 @@ private void internalMapWrapper(Context context, CharChunk path,
                 }
                 path.setStart(servletPath);
                 path.setEnd(pathEnd);
+                mappingData.matchedPath = path.toString();
             }
         }
     }

Diff for: modules/http-server/src/main/java/org/glassfish/grizzly/http/server/util/MappingData.java

@@ -80,6 +80,7 @@ public class MappingData {
     public Object wrapper = null;
     public String servletName = null;
     public String descriptorPath = null;
+    public String matchedPath = null;
     public boolean jspWildCard = false;
     // START GlassFish 1024
     public boolean isDefaultContext = false;
@@ -108,6 +109,7 @@ public void recycle() {
         isDefaultContext = false;
     // END GlassFish 1024
         descriptorPath = null;
+        matchedPath = null;
     }
 
     @Override
@@ -124,6 +126,7 @@ public String toString() {
         sb.append("\nredirectPath: ").append(redirectPath);
         sb.append("\nmappingType: ").append(getMappingDescription());
         sb.append("\ndescriptorPath: ").append(descriptorPath);
+        sb.append("\nmatchedPath: ").append(matchedPath);
         return sb.toString();
     }