svn commit: r1710346 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java

[markt]

Author: markt
Date: Sat Oct 24 14:51:31 2015
New Revision: 1710346

URL: http://svn.apache.org/viewvc?rev=1710346&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58508
Quote role names when used in MBean names since they may contain characters 
that require quoting.

Modified:
    tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1710346&r1=1710345&r2=1710346&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Sat Oct 24 
14:51:31 2015
@@ -483,16 +483,13 @@ public class MBeanUtils {
      *
      * @exception MalformedObjectNameException if a name cannot be created
      */
-    static ObjectName createObjectName(String domain,
-                                              Role role)
-        throws MalformedObjectNameException {
-
-        ObjectName name = null;
-        name = new ObjectName(domain + ":type=Role,rolename=" +
-                              role.getRolename() + ",database=" +
-                              role.getUserDatabase().getId());
-        return (name);
+    static ObjectName createObjectName(String domain, Role role)
+            throws MalformedObjectNameException {
 
+         ObjectName name = new ObjectName(domain + ":type=Role,rolename=" +
+                 ObjectName.quote(role.getRolename()) +
+                 ",database=" + role.getUserDatabase().getId());
+        return name;
     }
 
 
@@ -505,16 +502,13 @@ public class MBeanUtils {
      *
      * @exception MalformedObjectNameException if a name cannot be created
      */
-    static ObjectName createObjectName(String domain,
-                                              User user)
-        throws MalformedObjectNameException {
-
-        ObjectName name = null;
-        name = new ObjectName(domain + ":type=User,username=" +
-                              ObjectName.quote(user.getUsername())
-                              + ",database=" + user.getUserDatabase().getId());
-        return (name);
+    static ObjectName createObjectName(String domain, User user)
+            throws MalformedObjectNameException {
 
+        ObjectName name = new ObjectName(domain + ":type=User,username=" +
+                ObjectName.quote(user.getUsername()) +
+                ",database=" + user.getUserDatabase().getId());
+        return name;
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org