[infinispan-commits] Infinispan SVN: r1511 - in trunk: core/src/main/java/org/infinispan/manager and 1 other directory.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue Feb 16 10:07:16 EST 2010
Author: galder.zamarreno at jboss.com
Date: 2010-02-16 10:07:15 -0500 (Tue, 16 Feb 2010)
New Revision: 1511
Added:
trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationTest.java
Removed:
trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java
Modified:
trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
Log:
[ISPN-347] (NPE on JMX mbean on wrong Store configuration) Fixed.
Deleted: trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java 2010-02-15 22:24:47 UTC (rev 1510)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java 2010-02-16 15:07:15 UTC (rev 1511)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.infinispan.config.parsing;
-
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.InfinispanConfiguration;
-import org.infinispan.loaders.CacheStoreConfig;
-import org.infinispan.loaders.decorators.SingletonStoreConfig;
-import org.infinispan.loaders.jdbc.TableManipulation;
-import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.loaders.jdbc.connectionfactory.PooledConnectionFactory;
-import org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore;
-import org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStoreConfig;
-import org.testng.annotations.Test;
-
-import java.util.Map;
-
- at Test(groups = "unit", testName = "config.parsing.JdbcConfigurationParserTest")
-public class JdbcConfigurationParserTest {
-
- public void testCacheLoaders() throws Exception {
-
- InfinispanConfiguration configuration = InfinispanConfiguration.newInfinispanConfiguration("configs/jdbc-parsing-test.xml");
- Map<String, Configuration> namedConfigurations = configuration.parseNamedConfigurations();
- Configuration c = namedConfigurations.get("withJDBCLoader");
- CacheLoaderManagerConfig clc = c.getCacheLoaderManagerConfig();
- assert clc != null;
- assert clc.isFetchPersistentState();
- assert clc.isPassivation();
- assert clc.isShared();
- assert clc.isPreload();
-
- CacheStoreConfig iclc = (CacheStoreConfig) clc.getFirstCacheLoaderConfig();
- assert iclc.getCacheLoaderClassName().equals(JdbcStringBasedCacheStore.class.getName());
- assert iclc.getAsyncStoreConfig().isEnabled();
- assert iclc.getAsyncStoreConfig().getFlushLockTimeout() == 10000;
- assert iclc.getAsyncStoreConfig().getThreadPoolSize() == 10;
- assert iclc.isFetchPersistentState();
- assert iclc.isIgnoreModifications();
- assert iclc.isPurgeOnStartup();
-
- assert clc.getCacheLoaderConfigs().size() == 1;
- JdbcStringBasedCacheStoreConfig csConf = (JdbcStringBasedCacheStoreConfig) clc.getFirstCacheLoaderConfig();
- assert csConf.getCacheLoaderClassName().equals("org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore");
- assert csConf.isFetchPersistentState();
- assert csConf.isIgnoreModifications();
- assert csConf.isPurgeOnStartup();
- TableManipulation tableManipulation = csConf.getTableManipulation();
- ConnectionFactoryConfig cfc = csConf.getConnectionFactoryConfig();
- assert cfc.getConnectionFactoryClass().equals(PooledConnectionFactory.class.getName());
- assert cfc.getConnectionUrl().equals("jdbc://some-url");
- assert cfc.getUserName().equals("root");
- assert cfc.getDriverClass().equals("org.dbms.Driver");
- assert tableManipulation.getIdColumnType().equals("VARCHAR2(256)");
- assert tableManipulation.getDataColumnType().equals("BLOB");
- assert tableManipulation.isDropTableOnExit();
- assert !tableManipulation.isCreateTableOnStart();
-
-
- SingletonStoreConfig ssc = iclc.getSingletonStoreConfig();
- assert ssc.isSingletonStoreEnabled();
- assert ssc.isPushStateWhenCoordinator();
- assert ssc.getPushStateTimeout() == 20000;
- }
-}
Copied: trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationTest.java (from rev 1510, trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java)
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationTest.java (rev 0)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationTest.java 2010-02-16 15:07:15 UTC (rev 1511)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.infinispan.config.parsing;
+
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.InfinispanConfiguration;
+import org.infinispan.loaders.CacheStoreConfig;
+import org.infinispan.loaders.decorators.SingletonStoreConfig;
+import org.infinispan.loaders.jdbc.TableManipulation;
+import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.loaders.jdbc.connectionfactory.PooledConnectionFactory;
+import org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore;
+import org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStoreConfig;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.test.TestingUtil;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.Map;
+
+ at Test(groups = "unit", testName = "config.parsing.JdbcConfigurationTest")
+public class JdbcConfigurationTest {
+
+ public void testParseCacheLoaders() throws Exception {
+ InfinispanConfiguration configuration = InfinispanConfiguration.newInfinispanConfiguration("configs/jdbc-parsing-test.xml");
+ Map<String, Configuration> namedConfigurations = configuration.parseNamedConfigurations();
+ Configuration c = namedConfigurations.get("withJDBCLoader");
+ CacheLoaderManagerConfig clc = c.getCacheLoaderManagerConfig();
+ assert clc != null;
+ assert clc.isFetchPersistentState();
+ assert clc.isPassivation();
+ assert clc.isShared();
+ assert clc.isPreload();
+
+ CacheStoreConfig iclc = (CacheStoreConfig) clc.getFirstCacheLoaderConfig();
+ assert iclc.getCacheLoaderClassName().equals(JdbcStringBasedCacheStore.class.getName());
+ assert iclc.getAsyncStoreConfig().isEnabled();
+ assert iclc.getAsyncStoreConfig().getFlushLockTimeout() == 10000;
+ assert iclc.getAsyncStoreConfig().getThreadPoolSize() == 10;
+ assert iclc.isFetchPersistentState();
+ assert iclc.isIgnoreModifications();
+ assert iclc.isPurgeOnStartup();
+
+ assert clc.getCacheLoaderConfigs().size() == 1;
+ JdbcStringBasedCacheStoreConfig csConf = (JdbcStringBasedCacheStoreConfig) clc.getFirstCacheLoaderConfig();
+ assert csConf.getCacheLoaderClassName().equals("org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore");
+ assert csConf.isFetchPersistentState();
+ assert csConf.isIgnoreModifications();
+ assert csConf.isPurgeOnStartup();
+ TableManipulation tableManipulation = csConf.getTableManipulation();
+ ConnectionFactoryConfig cfc = csConf.getConnectionFactoryConfig();
+ assert cfc.getConnectionFactoryClass().equals(PooledConnectionFactory.class.getName());
+ assert cfc.getConnectionUrl().equals("jdbc://some-url");
+ assert cfc.getUserName().equals("root");
+ assert cfc.getDriverClass().equals("org.dbms.Driver");
+ assert tableManipulation.getIdColumnType().equals("VARCHAR2(256)");
+ assert tableManipulation.getDataColumnType().equals("BLOB");
+ assert tableManipulation.isDropTableOnExit();
+ assert !tableManipulation.isCreateTableOnStart();
+
+
+ SingletonStoreConfig ssc = iclc.getSingletonStoreConfig();
+ assert ssc.isSingletonStoreEnabled();
+ assert ssc.isPushStateWhenCoordinator();
+ assert ssc.getPushStateTimeout() == 20000;
+ }
+
+ @Test(expectedExceptions={org.infinispan.CacheException.class})
+ public void testWrongStoreConfiguration() throws IOException {
+ CacheManager cm = null;
+ try {
+ cm = new DefaultCacheManager("configs/illegal.xml");
+ cm.start();
+ //needs to get at least a cache to reproduce:
+ cm.getCache("AnyCache");
+ } finally {
+ TestingUtil.killCacheManagers(cm);
+ }
+ }
+}
Property changes on: trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java 2010-02-15 22:24:47 UTC (rev 1510)
+++ trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java 2010-02-16 15:07:15 UTC (rev 1511)
@@ -420,7 +420,7 @@
}
private void unregisterCacheMBean(Cache cache) {
- if (cache.getConfiguration().isExposeJmxStatistics()) {
+ if (cache.getStatus().allowInvocations() && cache.getConfiguration().isExposeJmxStatistics()) {
cache.getAdvancedCache().getComponentRegistry().getComponent(CacheJmxRegistration.class).unregisterCacheMBean();
}
}
More information about the infinispan-commits
mailing list