From c7e576cf1547b62332291d719985655c85cbbc6d Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Tue, 20 Feb 2007 15:02:38 +0000 Subject: [PATCH] MBeanServer.java: Updated. 2007-02-20 Gary Benson * javax/management/MBeanServer.java: Updated. * javax/management/MBeanServerConnection.java: Likewise. * javax/management/ObjectName.java: Likewise. * javax/management/StandardMBean.java: Likewise. From-SVN: r122165 --- libjava/classpath/ChangeLog.gcj | 7 + .../javax/management/MBeanServer.java | 4 +- .../management/MBeanServerConnection.java | 4 +- .../javax/management/ObjectName.java | 135 ++++++++++-------- .../javax/management/StandardMBean.java | 19 +-- .../lib/javax/management/MBeanServer.class | Bin 4177 -> 4423 bytes .../management/MBeanServerConnection.class | Bin 3243 -> 3489 bytes .../lib/javax/management/ObjectName.class | Bin 8394 -> 8844 bytes .../lib/javax/management/StandardMBean.class | Bin 14328 -> 14615 bytes libjava/javax/management/ObjectName.h | 3 + 10 files changed, 96 insertions(+), 76 deletions(-) diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index c147ab6a7a8..9273fe261c3 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,10 @@ +2007-02-20 Gary Benson + + * javax/management/MBeanServer.java: Updated. + * javax/management/MBeanServerConnection.java: Likewise. + * javax/management/ObjectName.java: Likewise. + * javax/management/StandardMBean.java: Likewise. + 2007-02-15 David Daney * tools/Makefile.am (TOOLS_ZIP): Add classes from vm-tools-packages. diff --git a/libjava/classpath/javax/management/MBeanServer.java b/libjava/classpath/javax/management/MBeanServer.java index 73a28e3b85a..0be5d71ad5d 100644 --- a/libjava/classpath/javax/management/MBeanServer.java +++ b/libjava/classpath/javax/management/MBeanServer.java @@ -890,7 +890,7 @@ public interface MBeanServer * arise from the execution of the query, in which * case that particular bean will again be excluded. */ - Set queryMBeans(ObjectName name, QueryExp query); + Set queryMBeans(ObjectName name, QueryExp query); /** *

@@ -929,7 +929,7 @@ public interface MBeanServer * Note that these permissions are implied if the * queryMBeans permissions are available. */ - Set queryNames(ObjectName name, QueryExp query); + Set queryNames(ObjectName name, QueryExp query); /** * Registers the supplied instance with the server, using the specified diff --git a/libjava/classpath/javax/management/MBeanServerConnection.java b/libjava/classpath/javax/management/MBeanServerConnection.java index dff03e8c0d4..cba6dacc63c 100644 --- a/libjava/classpath/javax/management/MBeanServerConnection.java +++ b/libjava/classpath/javax/management/MBeanServerConnection.java @@ -533,7 +533,7 @@ public interface MBeanServerConnection * @throws IOException if an I/O error occurred in communicating with * the bean server. */ - Set queryMBeans(ObjectName name, QueryExp query) + Set queryMBeans(ObjectName name, QueryExp query) throws IOException; /** @@ -560,7 +560,7 @@ public interface MBeanServerConnection * @throws IOException if an I/O error occurred in communicating with * the bean server. */ - Set queryNames(ObjectName name, QueryExp query) + Set queryNames(ObjectName name, QueryExp query) throws IOException; /** diff --git a/libjava/classpath/javax/management/ObjectName.java b/libjava/classpath/javax/management/ObjectName.java index 757b80fb266..8259eab02be 100644 --- a/libjava/classpath/javax/management/ObjectName.java +++ b/libjava/classpath/javax/management/ObjectName.java @@ -105,7 +105,7 @@ public class ObjectName /** * The properties, as key-value pairs. */ - private TreeMap properties; + private TreeMap properties = new TreeMap(); /** * The properties as a string (stored for ordering). @@ -164,7 +164,6 @@ public class ObjectName throw new MalformedObjectNameException("A name that is not a " + "pattern must contain at " + "least one key-value pair."); - properties = new TreeMap(); for (int a = 0; a < pairs.length; ++a) { int sep = pairs[a].indexOf('='); @@ -197,7 +196,6 @@ public class ObjectName throws MalformedObjectNameException { this.domain = domain; - properties = new TreeMap(); properties.put(key, value); checkComponents(); } @@ -216,7 +214,7 @@ public class ObjectName * @throws NullPointerException if one of the parameters is * null. */ - public ObjectName(String domain, Hashtable properties) + public ObjectName(String domain, Hashtable properties) throws MalformedObjectNameException { this.domain = domain; @@ -305,70 +303,80 @@ public class ObjectName { if (name.isPattern()) return false; - if (isPattern()) + + if (!isPattern()) + return equals(name); + + if (isDomainPattern()) { - boolean domainMatch, propMatch; - if (isDomainPattern()) + if (!domainMatches(domain, 0, name.getDomain(), 0)) + return false; + } + else + { + if (!domain.equals(name.getDomain())) + return false; + } + + if (isPropertyPattern()) + { + Hashtable oProps = name.getKeyPropertyList(); + Iterator i = properties.entrySet().iterator(); + while (i.hasNext()) { - String oDomain = name.getDomain(); - int oLength = oDomain.length(); - for (int a = 0; a < domain.length(); ++a) - { - char n = domain.charAt(a); - if (oLength == a && n != '*') - return false; - if (n == '?') - continue; - if (n == '*') - if ((a + 1) < domain.length()) - { - if (oLength == a) - return false; - char next; - do - { - next = domain.charAt(a + 1); - } while (next == '*'); - if (next == '?') - continue; - int pos = a; - while (oDomain.charAt(pos) != next) - { - ++pos; - if (pos == oLength) - return false; - } - } - if (n != oDomain.charAt(a)) - return false; - } - domainMatch = true; + Map.Entry entry = (Map.Entry) i.next(); + String key = (String) entry.getKey(); + if (!(oProps.containsKey(key))) + return false; + String val = (String) entry.getValue(); + if (!(val.equals(oProps.get(key)))) + return false; } - else - domainMatch = domain.equals(name.getDomain()); - if (isPropertyPattern()) + } + else + { + if (!getCanonicalKeyPropertyListString().equals + (name.getCanonicalKeyPropertyListString())) + return false; + } + return true; + } + + /** + * Returns true if the domain matches the pattern. + * + * @param pattern the pattern to match against. + * @param patternindex the index into the pattern to start matching. + * @param domain the domain to match. + * @param domainindex the index into the domain to start matching. + * @return true if the domain matches the pattern. + */ + private static boolean domainMatches(String pattern, int patternindex, + String domain, int domainindex) + { + while (patternindex < pattern.length()) + { + char c = pattern.charAt(patternindex++); + + if (c == '*') { - Hashtable oProps = name.getKeyPropertyList(); - Iterator i = properties.entrySet().iterator(); - while (i.hasNext()) + for (int i = domain.length(); i >= domainindex; i--) { - Map.Entry entry = (Map.Entry) i.next(); - String key = (String) entry.getKey(); - if (!(oProps.containsKey(key))) - return false; - String val = (String) entry.getValue(); - if (!(val.equals(oProps.get(key)))) - return false; + if (domainMatches(pattern, patternindex, domain, i)) + return true; } - propMatch = true; + return false; } - else - propMatch = - getCanonicalKeyPropertyListString().equals - (name.getCanonicalKeyPropertyListString()); - return domainMatch && propMatch; + + if (domainindex >= domain.length()) + return false; + + if (c != '?' && c != domain.charAt(domainindex)) + return false; + + domainindex++; } - return equals(name); + return true; } /** @@ -542,7 +550,8 @@ public class ObjectName * specifications. * @throws NullPointerException if name is null. */ - public static ObjectName getInstance(String domain, Hashtable properties) + public static ObjectName getInstance(String domain, + Hashtable properties) throws MalformedObjectNameException { return new ObjectName(domain, properties); @@ -571,9 +580,9 @@ public class ObjectName * @return a {@link java.util.Hashtable}, containing each of the object * name's properties. */ - public Hashtable getKeyPropertyList() + public Hashtable getKeyPropertyList() { - return new Hashtable(properties); + return new Hashtable(properties); } /** diff --git a/libjava/classpath/javax/management/StandardMBean.java b/libjava/classpath/javax/management/StandardMBean.java index 0434a40b8cc..b31436c6ec1 100644 --- a/libjava/classpath/javax/management/StandardMBean.java +++ b/libjava/classpath/javax/management/StandardMBean.java @@ -69,7 +69,7 @@ public class StandardMBean /** * The interface for this bean. */ - private Class iface; + private Class iface; /** * The implementation of the interface. @@ -94,7 +94,7 @@ public class StandardMBean * in the interface that doesn't comply * with the naming conventions. */ - protected StandardMBean(Class iface) + protected StandardMBean(Class iface) throws NotCompliantMBeanException { if (iface == null) @@ -133,7 +133,7 @@ public class StandardMBean * in the interface that doesn't comply * with the naming conventions. */ - public StandardMBean(Object impl, Class iface) + public StandardMBean(T impl, Class iface) throws NotCompliantMBeanException { if (impl == null) @@ -143,8 +143,8 @@ public class StandardMBean String className = impl.getClass().getName(); try { - iface = Class.forName(className + "MBean", true, - impl.getClass().getClassLoader()); + this.iface = Class.forName(className + "MBean", true, + impl.getClass().getClassLoader()); } catch (ClassNotFoundException e) { @@ -154,11 +154,12 @@ public class StandardMBean " was not found.").initCause(e)); } } - if (!(iface.isInstance(impl))) + else + this.iface = iface; + if (!(this.iface.isInstance(impl))) throw new NotCompliantMBeanException("The instance, " + impl + ", is not an instance of " + iface); this.impl = impl; - this.iface = iface; } /** @@ -493,7 +494,7 @@ public class StandardMBean * * @return the implementation class. */ - public Class getImplementationClass() + public Class getImplementationClass() { return impl.getClass(); } @@ -681,7 +682,7 @@ public class StandardMBean * * @return the management interface. */ - public final Class getMBeanInterface() + public final Class getMBeanInterface() { return iface; } diff --git a/libjava/classpath/lib/javax/management/MBeanServer.class b/libjava/classpath/lib/javax/management/MBeanServer.class index 119458287393905727ba200c032054d23f4b864c..68c2041fa131a636b5be6b7bdbf4c6d1f99de0a3 100644 GIT binary patch delta 309 zcmcbpa9oM&)W2Q(7#J7~8Dchaz2f5K49-l?ODriZN@ZlonS7DQVDe2a2}YaA4;dvU z=WuWe*;z9(a21xO7FGHs=B5@iGGw4Al4Y{9p8TKd9Am)bbKH9wLpS&Ea52|2GPnb+ zU}ErKVPx=RaASb+y?}gg1|J}w6DZHYz|0`XAj}{R6!m5BgNm{N^>H!ygT*+ohy`L1 x<3Sbk0cs9n2!;ysFt7p*RAmTZ5M|&8%7ih5qbLW7MKDC7hzSFEQD84b0|45dEzbY| delta 237 zcmX@EbWwrp)W2Q(7#J7~86r1wz2f5LDlAPcs`N|DO)Z}Ml=~c`@8m5!dl`c^7x8j2 z*E6s%GPpCiF@R_f22Tb?22P+>4hCihK?Y$4aiFLdgEv%^je&`Qi@^sh#(_o54~rNN vhL}G?091^Jfz<|RpejQkgD3+((AZ#x5ESJgu~3FE6ft2SFC6GZCWZ(AqI4T& diff --git a/libjava/classpath/lib/javax/management/MBeanServerConnection.class b/libjava/classpath/lib/javax/management/MBeanServerConnection.class index 2ca079e125e3fef1ddde45dfb0d3ba5195bb24b3..7f60a3e8f9bc562d836d4b807eb2584f5dd1992d 100644 GIT binary patch delta 307 zcmZ22xlo$x)W2Q(7#J7~8N4@gDRc0024|+{C6<&Hr7|+)OjhJHm@LF0!Duttkx^pu z0%lGjJ8MP;uENsPqDsHS+|*)5h71%%vP^c?lPx$h8SN)8;@HdRvN?gXg{hv2fgNZC z3j%oBLf!;BZCElIgo`cV##0y72#lDX5e732CK7VV8beEi&c~di>MugJxEjn sXgMFyFb)O<1_uUl20^g#P7KbI3wecQT^L+Zw2Crt0r_q~JxmPl0Fo~l1poj5 diff --git a/libjava/classpath/lib/javax/management/ObjectName.class b/libjava/classpath/lib/javax/management/ObjectName.class index 720f6689d434a74188173807d7bb9dde4a622799..28a3f54fbbff38c2a4ee95d15268b13aeca1d411 100644 GIT binary patch literal 8844 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 VO@iybl~`+99d+L#I?R&A{|Ank#zO!A diff --git a/libjava/classpath/lib/javax/management/StandardMBean.class b/libjava/classpath/lib/javax/management/StandardMBean.class index 29ed9dbc1f39211481727639ebef749ab42ad990..be542358394f1698d0efb2787d6a5eb8c703dc9c 100644 GIT binary patch literal 14615 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 diff --git a/libjava/javax/management/ObjectName.h b/libjava/javax/management/ObjectName.h index aaaf89b5ebf..21473cace9e 100644 --- a/libjava/javax/management/ObjectName.h +++ b/libjava/javax/management/ObjectName.h @@ -30,6 +30,9 @@ private: void checkComponents(); public: virtual jboolean apply(::javax::management::ObjectName *); +private: + static jboolean domainMatches(::java::lang::String *, jint, ::java::lang::String *, jint); +public: virtual jboolean equals(::java::lang::Object *); virtual ::java::lang::String * getCanonicalKeyPropertyListString(); virtual ::java::lang::String * getCanonicalName(); -- 2.30.2