You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2023/01/09 21:11:34 UTC
svn commit: r1906522 - in /db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management: CacheManagerMBeanTest.java MBeanTest.java
Author: rhillegas
Date: Mon Jan 9 21:11:34 2023
New Revision: 1906522
URL: http://svn.apache.org/viewvc?rev=1906522&view=rev
Log:
DERBY-7149: Re-enable skipped MBean tests; commit derby-7149-05-aa-reenableJMXTest.diff.
Modified:
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.java?rev=1906522&r1=1906521&r2=1906522&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.java Mon Jan 9 21:11:34 2023
@@ -181,20 +181,10 @@ public class CacheManagerMBeanTest exten
}
/**
- * Return false if we are using a remote JMX connection getter
- * but com.sun.management.jmxremote.serial.filter.pattern has not been hacked in conf/management/management.properties.
- */
- public boolean skipRemoteDeserialization() throws Exception {
- return (JMXConnectionDecorator.usingRemoteJMXConnectionGetter() && !remoteDeserializationEnabled());
- }
-
- /**
* Test the {@code CacheManagerMBean} for the page cache.
*/
public void testPageCache() throws Exception {
- if (skipRemoteDeserialization()) { return; }
-
getConnection(); // boot the database
Set<ObjectName> names =
queryMBeans(createObjectName("PageCache", null));
@@ -270,8 +260,6 @@ public class CacheManagerMBeanTest exten
*/
public void testStatementCache() throws Exception {
- if (skipRemoteDeserialization()) { return; }
-
getConnection(); // boot the database
Set<ObjectName> names =
queryMBeans(createObjectName("StatementCache", null));
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java?rev=1906522&r1=1906521&r2=1906522&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java Mon Jan 9 21:11:34 2023
@@ -129,6 +129,9 @@ abstract class MBeanTest extends BaseJDB
list.add("com.sun.management.jmxremote.authenticate=" +
Boolean.toString(authentication));
list.add("com.sun.management.jmxremote.ssl=false");
+
+ // this disables the default jmx deserialization filter. see DERBY-7149.
+ list.add("com.sun.management.jmxremote.serial.filter.pattern=");
if (authentication) {
list.add("com.sun.management.jmxremote.password.file=" +