From e6c45b1e3435efa993309f69654ac5411327d755 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Mon, 2 Apr 2007 16:24:35 +0000 Subject: [PATCH] [multiple changes] 2007-03-30 Andrew Haley * javax/management/ObjectName.java: Handle 0-length names. 2007-03-27 Andrew Haley * javax/management/MBeanServerFactory.java: Use the domain that we've been passed, not the fixed string "DefaultDomain". From-SVN: r123430 --- libjava/classpath/ChangeLog | 9 +++++++++ .../javax/management/MBeanServerFactory.java | 2 +- .../javax/management/ObjectName.java | 3 +++ .../javax/management/MBeanServerFactory.class | Bin 6622 -> 6621 bytes .../lib/javax/management/ObjectName.class | Bin 8844 -> 8872 bytes 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 3d3d23fe9d3..280af2ba923 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,12 @@ +2007-03-30 Andrew Haley + + * javax/management/ObjectName.java: Handle 0-length names. + +2007-03-27 Andrew Haley + + * javax/management/MBeanServerFactory.java: Use the domain that + we've been passed, not the fixed string "DefaultDomain". + 2007-03-29 Tom Tromey PR libgcj/29869: diff --git a/libjava/classpath/javax/management/MBeanServerFactory.java b/libjava/classpath/javax/management/MBeanServerFactory.java index 54195635bd2..a8dac948984 100644 --- a/libjava/classpath/javax/management/MBeanServerFactory.java +++ b/libjava/classpath/javax/management/MBeanServerFactory.java @@ -370,7 +370,7 @@ public class MBeanServerFactory MBeanServerDelegate delegate = builder.newMBeanServerDelegate(); if (delegate == null) throw new JMRuntimeException("A delegate could not be created."); - MBeanServer server = builder.newMBeanServer("DefaultDomain", null, delegate); + MBeanServer server = builder.newMBeanServer(domain, null, delegate); if (server == null) throw new JMRuntimeException("A server could not be created."); return server; diff --git a/libjava/classpath/javax/management/ObjectName.java b/libjava/classpath/javax/management/ObjectName.java index 8259eab02be..604205437f3 100644 --- a/libjava/classpath/javax/management/ObjectName.java +++ b/libjava/classpath/javax/management/ObjectName.java @@ -143,6 +143,9 @@ public class ObjectName public ObjectName(String name) throws MalformedObjectNameException { + if (name.length() == 0) + name = "*:*"; + int domainSep = name.indexOf(':'); if (domainSep == -1) throw new MalformedObjectNameException("No domain separator was found."); diff --git a/libjava/classpath/lib/javax/management/MBeanServerFactory.class b/libjava/classpath/lib/javax/management/MBeanServerFactory.class index 4b73417d78c721a769d28b8c518625d9635257ff..d1a09850473a2895a67b75409b1128154e5dcca8 100644 GIT binary patch delta 79 zcmca-eAjrx1~E=2237_Z1_nls$vee9GHOj;BYs=)2V)t-AI5Se9w5p1~E=&237_Z1_nmX$vee9G6_wayjuLW;!nmhhQEyEjO>gR3}Orn3^5Fx iASDbb45>gKFT#ALMyW84!*WFh8-0pV!u-&>^rQiAQO=dy@i+JbW z`#;Y6eE&H&&%gcnlK_@TdkB`GW>0)?eE;I!cq+cz>2*@M#nf~s{z zs+)3|L~8dkL3v*$-RER-2`4LPoOLpLos8fjLu!<%)~|HpDO!N@BpO_v zNF{R3f=Jz1t_!wO!BzXaoW5KloyvxAp~9DccnAEPIu7>BYOn?wsf~s4j*c4 zOu-C+uWrHC5H1o-GUhBbRyk@>QwG6I8x^q2F&lG3m@~?suHrW4VLqi#I;q{c9z(P} zj0Jp%HN|vay^RJe6oe9~ZfE~>yC_Iq`vR_6OrvZ_M_s2zvrb<;6VIhH(S7l3bXPi` z>RwciX;`AdMwHNHHZI3I=*4V)XV!RKFtx6|eZg3BspMDKC_}k!T&f$J)Ue~N4P!Z7 zWkhYZ(Soa}jB{H)o@5w}a)oQuWec_|^_4a%F)56z1y+OEyxPV!SR)8KsqSn?LTxc> zyBDbL_G@iSM0ptN$htvg++gE6Y!n2teaS>lFn_!txN)qe<&@oPMibjloP$xIk0eV zJeha6Hj$w#YO&2mr<$k2+mK!B90=n^!R*aFPBg1rxGS3O>dI%b(cW~%a7~e1mtzRr zWaH0pGee^23(p~Z7);OVt@7|z4*OTDtT0?$RS{9RsS?O2f(X?)qZgL1i($3+Glcfp) zwT;5fIG*9cI8|j_^OtrZj`x|g&Seg4 za_IF*bsppx?Krfo0tazd2=5nMP=r!W*!T;4fO`|!Trkb7 zH6+})TbWNJyPZrJpQH?}CXt8JT&-A+`>;fR25j7qPm@@@ua8J4m{Hd@7J)r#%fk2! z0djs+cOKTAM|f_H6P4$p@HrlRMGq>a2W@;FgS2Zd?FxUURlHPE<-cg-OR9XB%5POX zQ}j4$<8Sa~o=N%CZTWPL2|n+X>bn-TU^o|>)RM5zg9 zjSj@eDD-&CG!zOph7{35J@M=YdOd^_f>}kEwI`F#?s&2_vpcUvSIHqCP)iY!tQ*@1 zKne0F$*bXjBCZ9vEkjHy&C`*f(Rt4<0lGQKby3$oX9LOw+tsYi`tx-g-%!~nCbCzX zdd)kNbnfqMJg1H;qchw|9eu&ZH}Mb59XET|$8!XA>abuOpR|t!%yyUgKic>wh9n_!weZEWB#tNBA*wP@UaM##&L) z-y!c<7uepDskwM!yO#Cdq>G`^rk4LN8~?3RRF+DiwL5vGckZFNO3dvk#Jy=v!W#Yg zt>*M=XXNxanvcR5X3_6SWd#M^>7own{t`x`7pubmXX6dL$@M1Pw1ym&uV-aQPH&M@ zlLGl^TVQf3kzLi>mpc#^_Aj(S1$A#vWpi;>DT3wyPn;Vu&z1#h(j_4Yje^(qly(F0 zNs%JF(YExg#Z*QZ7M)uLQ-mNXB+8<4nXadHExs>UF+Rwhr%D7nnWaLr z^1E=f(4|dqmAFt z%ttm`VPT(W?U)soC3=sAZg+i#Dkacn;{WXEs&2_AK_UGYAryI6EKMQNzpc%@kOY)a=dUC!!+b}nJ0 z1Q6n7X}8NSGnV%2oVma}PvAQnP4mot)!eBd@6}wx#+vg}`R3=_G>$>ONm^l!{4O?x z>9Lcj?Ht0z#}KVAVAcSFEcWXwn+k}nm|-2p1t&4Bvue>0E;$ve_suBa(qm|>pW(ly zfGamFtXfvUihfkY{KwEbh{Fr3+6q|JPqI1?Tj*Oznt^V!t9=mR*urCIk3EL=s3a0D4VfPHun?_-gA4+gpFOE`q1c!)LUaeNui;463$ zkKo4~{}mp?YdD5(a=XE`I~?rd8$E#C^c+hsd>cJT&{M5=6ni-4Bkf+?O4zxbI9KN}%(IGD zKyFw#AJkv2a4&np{ea|uh#7c=wtLkG7j+4a2sd*?xS7nC{S@v1sc7DiEk|zWh^1c` z_*)c`!dX|j`611;Q=`cQ>yQ^{@ALw#v9g?DIWqii9S%Pc==4=KZRzw^Hf-q(RK~V+ z1}j^(bcQNdY+0u!FW|i=aHnAXAYN`bfe#9v!ae+d!@?8zD}9;Wx6t{O$z4f6RRjvo{1CKjF(A6^tK+{^Gislcl;5kHqo{8pymb%{torb?AelZ)g+naAgt zOp(huvqEZ2wCrGXK$^X1Sxadi$4N@O4L`*b_*+Wc!=Qf>rx;aPJZ-|;&#xjaUM4<; z95m1a>~?OY>og~S@6BpXK8>&OSJCz$BQ`|6A1AzC-;aRrs0(*xF%JBlzC6>9h=!Vv z1JC-7K!6?acD>jSheO|5Um8st25~igJ`zm|sw43fXs8Yp@Et=yhrP%M zRtL?*_lAj+fbrUiK}@DZFO$p5!*l+ll-~8=9%dorGK6T$GHFDmT!E>wl*j)ve*az0 z@4Z)Hg|wnYuEuIvjkR(Ow#gcPK)exI;GJZn+KvvXLJe)=;c1I4WD& zd2c~MI&fS%jhEKAmK(|G$BCD_XxFv42|qA7y$u_UzkKw-WyW8APuC;#wch~U&4btyt2roAz$=aZh`%y+7;_qUVCm^IIabpUVa7a9m-&w#44jSx zYCn7Wm%gL5y5fj>ggaUeVPeGJP)iDjbm*W@YG}V%M^1mS#B9wxU?4s4$sSxFNlcLx zP1c7xxeYNsUnW_8_1;Uxt362H0lHa{O19Wq>qVM$jry>2AQvVcWJ;nY7Rr>|q ze$-cVc@?QZK1`S216w}Ize?O|eORW2?T@SCdN5$RlD;~OE5uN^MZ^rO69i;3a)fzv|_-Ul8gGdE`E znM^;#zdRjAM2=8_&ta}Sz}S3{z2fH?n@7+sUoc9!2VBBaDvUVM=?_#Pg3TT(%tfPz z3Zi|rr(T}wsViDka82Cfc%5ij^+(F3>Ezy+zSG>yeY+pws%3+ysA?NTaI!|A0(ntr z*XpM*S)Rglc^b>)lo8N9zFIs1ML)H8A}r=zMF=SSBB7uT$_pi%1K#E`@rl-idK}+M z`89wpCIohBAPh<1;dLh^*g09kLsDK}kcy`yc*=0l;&Ym3+^LK#$SaJDA2G6jifQsQ z)W}Z^yQwZold@n;R>?#HG&@@|p2WFPhc1)XHDQ?%LHSc2*MqJOZsb_N6{A+HFyPLDo3chotSGCgVq~f@+eXH; znyuVrG$hlMk6W%7p{+|wEKxqfr`!}IQc{rU$nE4TQqA(wbxH>*DfOEAXEEWVOs6kq z49P{OG=%7oi&-xe)taChTg&0MR$!vlT*9_yBt>gH^+dmuk+iEy)Tq+P{i?Wq5-({4 zM~7r)k-DqQx)KlA!yzcMM?$bo6(EgC+~58U7W=$Ctl?iICw5yqf@JNCQDsGVgp9XM)oiI zOyn+sYnN!IglO#u(M=;nmy@^(S49n<8Gy~(i{n$eql8k`2qk{W^u#Mo-PSX8`%uZ| zkHx+;^Y#Jnpw#Xmf%4uv}^M3$t}|fqN3}GzFW*lQ1nyc_uQ)#%=A+9hXB}e7<2X~kc}T806;pfq*+!SnwCc>T*Zp+&HqYIaI}W2Q zrfx9aS7MjfYN@iQwla1Ib+wh{hcK(Qa>pUeP$o)avb6EQQvYc~LBgYb>F+*r`hn4I zT&>?4tT#|@y@`nR7Uo!QV=+PK3LihQ`g~aF^J9%Ki0geJbos(a`^xZcUpWr){sEtj qk8s`nzKO=X!|q#U+;;^F7T0}C*`I0WYhfk-j=tJ+pN6R=YyJd@b5l70 literal 8844 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