Author: trustin
Date: Fri Nov 30 01:04:47 2007
New Revision: 599745
URL: http://svn.apache.org/viewvc?rev=599745&view=rev
Log:
More sanity check for IoFuture implementations
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultReadFuture.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteFuture.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java?rev=599745&r1=599744&r2=599745&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java
Fri Nov 30 01:04:47 2007
@@ -737,8 +737,11 @@
}
}
- public void setException(Exception cause) {
- setValue(cause);
+ public void setException(Exception exception) {
+ if (exception == null) {
+ throw new NullPointerException("exception");
+ }
+ setValue(exception);
}
}
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java?rev=599745&r1=599744&r2=599745&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java
Fri Nov 30 01:04:47 2007
@@ -82,10 +82,16 @@
}
public void setSession(IoSession session) {
+ if (session == null) {
+ throw new NullPointerException("session");
+ }
setValue(session);
}
public void setException(Throwable exception) {
+ if (exception == null) {
+ throw new NullPointerException("exception");
+ }
setValue(exception);
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultReadFuture.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultReadFuture.java?rev=599745&r1=599744&r2=599745&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DefaultReadFuture.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultReadFuture.java
Fri Nov 30 01:04:47 2007
@@ -96,11 +96,18 @@
}
public void setRead(Object message) {
+ if (message == null) {
+ throw new NullPointerException("message");
+ }
setValue(message);
}
- public void setException(Throwable cause) {
- setValue(new ExceptionHolder(cause));
+ public void setException(Throwable exception) {
+ if (exception == null) {
+ throw new NullPointerException("exception");
+ }
+
+ setValue(new ExceptionHolder(exception));
}
@Override
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteFuture.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteFuture.java?rev=599745&r1=599744&r2=599745&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteFuture.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteFuture.java
Fri Nov 30 01:04:47 2007
@@ -76,8 +76,12 @@
setValue(Boolean.TRUE);
}
- public void setException(Throwable cause) {
- setValue(cause);
+ public void setException(Throwable exception) {
+ if (exception == null) {
+ throw new NullPointerException("exception");
+ }
+
+ setValue(exception);
}
@Override