You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/01/04 08:26:25 UTC
svn commit: r492433 - in /mina:
branches/1.0/core/src/main/java/org/apache/mina/common/
branches/1.1/core/src/main/java/org/apache/mina/common/
trunk/core/src/main/java/org/apache/mina/common/
Author: trustin
Date: Wed Jan 3 23:26:24 2007
New Revision: 492433
URL: http://svn.apache.org/viewvc?view=rev&rev=492433
Log:
Fixed a bug that DefaultIoFilterChainBuilder.clone() doesn't call super.clone() to create a cloned instance. (just testing FindBugs ;)
Modified:
mina/branches/1.0/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java
mina/branches/1.1/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java
Modified: mina/branches/1.0/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java?view=diff&rev=492433&r1=492432&r2=492433
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java Wed Jan 3 23:26:24 2007
@@ -56,16 +56,23 @@
*/
public class DefaultIoFilterChainBuilder implements IoFilterChainBuilder, Cloneable
{
- private List entries = new ArrayList();
- private final Map entriesByName = new HashMap();
+ private List entries;
+ private Map entriesByName;
/**
* Creates a new instance with an empty filter list.
*/
public DefaultIoFilterChainBuilder()
{
+ init();
}
+ private void init()
+ {
+ entries = new ArrayList();
+ entriesByName = new HashMap();
+ }
+
/**
* @see IoFilterChain#getEntry(String)
*/
@@ -230,8 +237,7 @@
*/
public synchronized void clear() throws Exception
{
- entries = new ArrayList();
- entriesByName.clear();
+ init();
}
public void buildFilterChain( IoFilterChain chain ) throws Exception
@@ -281,7 +287,18 @@
public Object clone()
{
- DefaultIoFilterChainBuilder ret = new DefaultIoFilterChainBuilder();
+ DefaultIoFilterChainBuilder ret;
+ try
+ {
+ ret = ( DefaultIoFilterChainBuilder ) super.clone();
+ }
+ catch( CloneNotSupportedException e )
+ {
+ throw ( InternalError ) new InternalError().initCause(e);
+ }
+
+ ret.init();
+
for( Iterator i = entries.iterator(); i.hasNext(); )
{
Entry e = ( Entry ) i.next();
Modified: mina/branches/1.1/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java?view=diff&rev=492433&r1=492432&r2=492433
==============================================================================
--- mina/branches/1.1/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java (original)
+++ mina/branches/1.1/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java Wed Jan 3 23:26:24 2007
@@ -56,16 +56,23 @@
*/
public class DefaultIoFilterChainBuilder implements IoFilterChainBuilder, Cloneable
{
- private List entries = new ArrayList();
- private final Map entriesByName = new HashMap();
+ private List entries;
+ private Map entriesByName;
/**
* Creates a new instance with an empty filter list.
*/
public DefaultIoFilterChainBuilder()
{
+ init();
}
+ private void init()
+ {
+ entries = new ArrayList();
+ entriesByName = new HashMap();
+ }
+
/**
* @see IoFilterChain#getEntry(String)
*/
@@ -230,8 +237,7 @@
*/
public synchronized void clear() throws Exception
{
- entries = new ArrayList();
- entriesByName.clear();
+ init();
}
public void buildFilterChain( IoFilterChain chain ) throws Exception
@@ -281,7 +287,18 @@
public Object clone()
{
- DefaultIoFilterChainBuilder ret = new DefaultIoFilterChainBuilder();
+ DefaultIoFilterChainBuilder ret;
+ try
+ {
+ ret = ( DefaultIoFilterChainBuilder ) super.clone();
+ }
+ catch( CloneNotSupportedException e )
+ {
+ throw ( InternalError ) new InternalError().initCause(e);
+ }
+
+ ret.init();
+
for( Iterator i = entries.iterator(); i.hasNext(); )
{
Entry e = ( Entry ) i.next();
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java?view=diff&rev=492433&r1=492432&r2=492433
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java Wed Jan 3 23:26:24 2007
@@ -56,14 +56,21 @@
*/
public class DefaultIoFilterChainBuilder implements IoFilterChainBuilder, Cloneable
{
- private List<Entry> entries = new ArrayList<Entry>();
- private final Map<String, Entry> entriesByName = new HashMap<String, Entry>();
+ private List<Entry> entries;
+ private Map<String, Entry> entriesByName;
/**
* Creates a new instance with an empty filter list.
*/
public DefaultIoFilterChainBuilder()
{
+ init();
+ }
+
+ private void init()
+ {
+ entries = new ArrayList<Entry>();
+ entriesByName = new HashMap<String, Entry>();
}
/**
@@ -281,7 +288,18 @@
public Object clone()
{
- DefaultIoFilterChainBuilder ret = new DefaultIoFilterChainBuilder();
+ DefaultIoFilterChainBuilder ret;
+ try
+ {
+ ret = ( DefaultIoFilterChainBuilder ) super.clone();
+ }
+ catch( CloneNotSupportedException e )
+ {
+ throw ( InternalError ) new InternalError().initCause(e);
+ }
+
+ ret.init();
+
for( Iterator i = entries.iterator(); i.hasNext(); )
{
Entry e = ( Entry ) i.next();