--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/LazyCompositeDataTest.java Tue Oct 20 20:53:13 2015 +0200
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.management.openmbean.ArrayType;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
+import javax.management.openmbean.CompositeType;
+import javax.management.openmbean.OpenDataException;
+import javax.management.openmbean.OpenType;
+import javax.management.openmbean.SimpleType;
+import sun.management.LazyCompositeData;
+
+/**
+ * @test
+ * @bug 8139870
+ * @summary sun.management.LazyCompositeData.isTypeMatched() fails for composite types with items of ArrayType
+ * @modules java.management/sun.management
+ * @author Jaroslav Bachorik
+ */
+
+public class LazyCompositeDataTest {
+ private final static CompositeData dataV1, dataV2;
+
+ static {
+ try {
+ // ***
+ // prepare the composite types
+
+ // composite type stored in an array; V1
+ CompositeType subtypeV1 = new CompositeType(
+ "Subtype1",
+ "Version 1",
+ new String[]{"item1"},
+ new String[]{"Item 1"},
+ new OpenType<?>[]{
+ SimpleType.STRING
+ }
+ );
+
+ // composite type stored in an array; V2
+ CompositeType subtypeV2 = new CompositeType(
+ "Subtype2",
+ "Version 2",
+ new String[]{"item1", "item2"},
+ new String[]{"Item 1", "Item 2"},
+ new OpenType<?>[]{
+ SimpleType.STRING,
+ SimpleType.INTEGER
+ }
+ );
+
+
+ // main composite type; V1
+ // one of the items is array of 'subtypeV1' instances
+ CompositeType typeV1 = new CompositeType(
+ "MyDataV1",
+ "Version 1",
+ new String[]{"item1", "item2"},
+ new String[]{"Item 1", "Item 2"},
+ new OpenType<?>[]{
+ SimpleType.STRING,
+ ArrayType.getArrayType(subtypeV1)
+ }
+ );
+
+ // main composite type; V2
+ // one of the items is array of 'subtypeV2' instances
+ CompositeType typeV2 = new CompositeType(
+ "MyDataV2",
+ "Version 2",
+ new String[]{"item1", "item2"},
+ new String[]{"Item 1", "Item 2"},
+ new OpenType<?>[]{
+ SimpleType.STRING,
+ ArrayType.getArrayType(subtypeV2)
+ }
+ );
+ // ***
+
+ // ***
+ // construct the data
+ Map<String, Object> subitemsV1 = new HashMap<>();
+ Map<String, Object> subitemsV2 = new HashMap<>();
+
+ Map<String, Object> itemsV1 = new HashMap<>();
+ Map<String, Object> itemsV2 = new HashMap<>();
+
+ subitemsV1.put("item1", "item1");
+ subitemsV2.put("item1", "item1");
+ subitemsV2.put("item2", 42);
+
+ itemsV1.put("item1", "item1");
+ itemsV1.put("item2", new CompositeData[]{new CompositeDataSupport(subtypeV1, subitemsV1)});
+
+ itemsV2.put("item1", "item1");
+ itemsV2.put("item2", new CompositeData[]{new CompositeDataSupport(subtypeV2, subitemsV2)});
+
+ dataV1 = new CompositeDataSupport(typeV1, itemsV1);
+ dataV2 = new CompositeDataSupport(typeV2, itemsV2);
+ // ***
+ } catch (OpenDataException e) {
+ throw new Error(e);
+ }
+ }
+
+ private static class MyDataV1 extends LazyCompositeData {
+ @Override
+ protected CompositeData getCompositeData() {
+ return dataV1;
+ }
+
+ public boolean isTypeMached(CompositeType type) {
+ return isTypeMatched(this.getCompositeType(), type);
+ }
+ }
+
+ private static class MyDataV2 extends LazyCompositeData {
+ @Override
+ protected CompositeData getCompositeData() {
+ return dataV2;
+ }
+
+ }
+
+ public static void main(String[] args) throws Exception {
+ System.out.println("Checking LazyCompositeData.isTypeMatched()");
+ MyDataV1 v1 = new MyDataV1();
+ MyDataV2 v2 = new MyDataV2();
+
+ if (!v1.isTypeMached(v2.getCompositeType())) {
+ System.err.println("=== FAILED");
+ System.err.println("V1 should be matched by V2");
+ System.err.println("\n=== V1");
+ System.err.println(v1.getCompositeType());
+ System.err.println("\n=== V2");
+ System.err.println(v2.getCompositeType());
+ throw new Error();
+ }
+ System.out.println("=== PASSED");
+ }
+}
\ No newline at end of file