src/java.management.rest/share/classes/com/oracle/jmx/remote/rest/http/MBeanCollectionResource.java
branchjmx-rest-api
changeset 55995 a798bdd52997
parent 55994 9721e36abeb0
child 55996 e8d4ccaf6877
--- a/src/java.management.rest/share/classes/com/oracle/jmx/remote/rest/http/MBeanCollectionResource.java	Mon Dec 25 20:42:05 2017 +0530
+++ b/src/java.management.rest/share/classes/com/oracle/jmx/remote/rest/http/MBeanCollectionResource.java	Wed Dec 27 14:44:48 2017 +0530
@@ -92,12 +92,13 @@
     @Override
     public void handle(HttpExchange exchange) throws IOException {
         String path = exchange.getRequestURI().getPath();
-        if (path.matches("^\\/?jmx\\/servers\\/[a-zA-Z0-9\\-\\.]+\\/mbeans\\/?$")) {
+        String pathPrefix = "^/?jmx/servers/[a-zA-Z0-9\\-\\.]+/mbeans";
+        if (path.matches(pathPrefix + "/?$")) {
             RestResource.super.handle(exchange);
-        } else if (path.matches("^\\/?jmx\\/servers\\/[a-zA-Z0-9\\-\\.]+\\/mbeans\\/[^\\/]+\\/?.*")) {
+        } else if (path.matches(pathPrefix + "/[^/]+/?.*")) {
             // Extract mbean name
             // Forward the request to its corresponding rest resource
-            Pattern mbeans = Pattern.compile("^\\/?jmx\\/servers\\/[a-zA-Z0-9\\-\\.]+\\/mbeans\\/");
+            Pattern mbeans = Pattern.compile(pathPrefix + "/");
             Matcher matcher = mbeans.matcher(path);
 
             if (matcher.find()) {