Author: trustin
Date: Thu Mar 22 18:03:39 2007
New Revision: 521553
URL: http://svn.apache.org/viewvc?view=rev&rev=521553
Log:
Fixed reopened issue DIRMINA-357 (ConcurrentHashMap.put(key, null) throws an
NPE effects BaseIOSession attachments/attributes)
* setAttachment() still could throw a NPE. Fixed by delegating the call to
setAttribute().
Modified:
mina/branches/1.1/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
Modified:
mina/branches/1.1/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
URL:
http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java?view=diff&rev=521553&r1=521552&r2=521553
==============================================================================
---
mina/branches/1.1/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
(original)
+++
mina/branches/1.1/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
Thu Mar 22 18:03:39 2007
@@ -166,12 +166,12 @@
public Object getAttachment()
{
- return attributes.get( "" );
+ return getAttribute( "" );
}
public Object setAttachment( Object attachment )
{
- return attributes.put( "", attachment );
+ return setAttribute( "", attachment );
}
public Object getAttribute( String key )
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java?view=diff&rev=521553&r1=521552&r2=521553
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
Thu Mar 22 18:03:39 2007
@@ -164,15 +164,14 @@
writeRequest.getFuture().setWritten( false );
}
-
public Object getAttachment()
{
- return attributes.get( "" );
+ return getAttribute( "" );
}
public Object setAttachment( Object attachment )
{
- return attributes.put( "", attachment );
+ return setAttribute( "", attachment );
}
public Object getAttribute( String key )
