ISPN-1898 Check whether cache store is writable before logging message

infinispan · Mar 20, 2012 · af91624 · af91624
1 parent 922ec9a
commit af91624
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java b/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java
@@ -34,12 +34,14 @@
 
 /**
  * ConfigurationValidatingVisitor checks semantic validity of InfinispanConfiguration instance.
- * 
- * 
+ *
+ *
  * @author Vladimir Blagojevic
  * @since 4.0
+ * @deprecated Belongs to old configuration and so will dissapear in future releases
  */
 @SuppressWarnings("boxing")
+@Deprecated
 public class ConfigurationValidatingVisitor extends AbstractConfigurationBeanVisitor {
 
    private static final Log log = LogFactory.getLog(ConfigurationValidatingVisitor.class);

diff --git a/core/src/main/java/org/infinispan/configuration/cache/LoaderConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/LoaderConfigurationBuilder.java
@@ -3,6 +3,7 @@
 import java.util.Properties;
 
 import org.infinispan.loaders.CacheLoader;
+import org.infinispan.loaders.CacheStore;
 import org.infinispan.util.TypedProperties;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
@@ -119,7 +120,8 @@ void validate() {
       async.validate();
       singletonStore.validate();
       if (!getLoadersBuilder().shared() && !fetchPersistentState && !purgeOnStartup
-            && getBuilder().clustering().cacheMode().isClustered())
+            && getBuilder().clustering().cacheMode().isClustered()
+            && cacheLoader instanceof CacheStore)
          log.staleEntriesWithoutFetchPersistentStateOrPurgeOnStartup();
    }