Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-jcs.git
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java
index c1db9ed..4cdcb18 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java
@@ -39,7 +39,6 @@
import org.apache.commons.jcs3.auxiliary.disk.jdbc.dsfactory.DataSourceFactory;
import org.apache.commons.jcs3.engine.behavior.ICache;
import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEvent;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.engine.stats.StatElement;
@@ -47,7 +46,6 @@
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
import org.apache.commons.jcs3.log.LogManager;
-import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
/**
* This is the jdbc disk cache plugin.
@@ -85,9 +83,6 @@
/** The local logger. */
private static final Log log = LogManager.getLog( JDBCDiskCache.class );
- /** custom serialization */
- private IElementSerializer elementSerializer = new StandardSerializer();
-
/** configuration */
private JDBCDiskCacheAttributes jdbcDiskCacheAttributes;
@@ -701,24 +696,6 @@
}
/**
- * @param elementSerializer The elementSerializer to set.
- */
- @Override
- public void setElementSerializer( final IElementSerializer elementSerializer )
- {
- this.elementSerializer = elementSerializer;
- }
-
- /**
- * @return Returns the elementSerializer.
- */
- @Override
- public IElementSerializer getElementSerializer()
- {
- return elementSerializer;
- }
-
- /**
* @param jdbcDiskCacheAttributes The jdbcDiskCacheAttributes to set.
*/
protected void setJdbcDiskCacheAttributes( final JDBCDiskCacheAttributes jdbcDiskCacheAttributes )
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/behavior/IMemoryCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/behavior/IMemoryCache.java
index fa5b2fe..d41dc68 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/behavior/IMemoryCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/behavior/IMemoryCache.java
@@ -149,7 +149,7 @@
* @throws IOException
* Description of the Exception
*/
- void waterfal( ICacheElement<K, V> ce )
+ void waterfal( ICacheElement<K, V> ce ) // FIXME: Correct typo before 4.0, see JCS-222
throws IOException;
/**
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 964b804..fdec0c9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -26,10 +26,10 @@
IPv6 link-local address for IPv6 multicast,
IPv4 site-local address for IPv4 multicast
</action>
- <action dev="tv" type="fix">
+ <action dev="tv" type="fix" due-to="Alex L" issue="JCS-186">
Use configured listener address for UDP service broadcast
</action>
- <action dev="tv" type="fix">
+ <action dev="tv" type="fix" due-to="Alex L" issue="JCS-186">
Fix UDP service discovery with LateralCache
</action>
<action dev="tv" type="update">
