You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2010/05/10 15:06:10 UTC
svn commit: r942725 [2/2] - in /mina/trunk:
core/src/main/java/org/apache/mina/core/buffer/
core/src/main/java/org/apache/mina/core/filterchain/
core/src/main/java/org/apache/mina/core/future/
core/src/main/java/org/apache/mina/core/polling/ core/src/m...
Modified: mina/trunk/core/src/main/java/org/apache/mina/util/byteaccess/ByteArrayList.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/util/byteaccess/ByteArrayList.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/util/byteaccess/ByteArrayList.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/util/byteaccess/ByteArrayList.java Mon May 10 13:06:07 2010
@@ -176,7 +176,6 @@ class ByteArrayList
*
* @param nodeToInsert new node to insert
* @param insertBeforeNode node to insert before
- * @throws NullPointerException if either node is null
*/
protected void addNode( Node nodeToInsert, Node insertBeforeNode )
{
@@ -192,7 +191,6 @@ class ByteArrayList
* Removes the specified node from the list.
*
* @param node the node to remove
- * @throws NullPointerException if <code>node</code> is null
*/
protected Node removeNode( Node node )
{
@@ -245,8 +243,9 @@ class ByteArrayList
if ( ba == null )
{
- throw new NullPointerException( "ByteArray must not be null." );
+ throw new IllegalArgumentException( "ByteArray must not be null." );
}
+
this.ba = ba;
}
Modified: mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/ArrayEditor.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/ArrayEditor.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/ArrayEditor.java (original)
+++ mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/ArrayEditor.java Mon May 10 13:06:07 2010
@@ -36,7 +36,7 @@ public class ArrayEditor extends Abstrac
public ArrayEditor(Class<?> componentType) {
if (componentType == null) {
- throw new NullPointerException("componentType");
+ throw new IllegalArgumentException("componentType");
}
this.componentType = componentType;
Modified: mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/CollectionEditor.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/CollectionEditor.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/CollectionEditor.java (original)
+++ mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/CollectionEditor.java Mon May 10 13:06:07 2010
@@ -42,7 +42,7 @@ public class CollectionEditor extends Ab
public CollectionEditor(Class<?> elementType) {
if (elementType == null) {
- throw new NullPointerException("elementType");
+ throw new IllegalArgumentException("elementType");
}
this.elementType = elementType;
Modified: mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/EnumEditor.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/EnumEditor.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/EnumEditor.java (original)
+++ mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/EnumEditor.java Mon May 10 13:06:07 2010
@@ -39,7 +39,7 @@ public class EnumEditor extends Abstract
public EnumEditor(Class enumType) {
if (enumType == null) {
- throw new NullPointerException("enumType");
+ throw new IllegalArgumentException("enumType");
}
this.enumType = enumType;
Modified: mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/MapEditor.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/MapEditor.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/MapEditor.java (original)
+++ mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/MapEditor.java Mon May 10 13:06:07 2010
@@ -45,10 +45,10 @@ public class MapEditor extends AbstractP
public MapEditor(Class<?> keyType, Class<?> valueType) {
if (keyType == null) {
- throw new NullPointerException("keyType");
+ throw new IllegalArgumentException("keyType");
}
if (valueType == null) {
- throw new NullPointerException("valueType");
+ throw new IllegalArgumentException("valueType");
}
this.keyType = keyType;
this.valueType = valueType;
Modified: mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/PropertyEditorFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/PropertyEditorFactory.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/PropertyEditorFactory.java (original)
+++ mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/PropertyEditorFactory.java Mon May 10 13:06:07 2010
@@ -84,7 +84,7 @@ public final class PropertyEditorFactory
// parent type / property name / property type
public static PropertyEditor getInstance(Class<?> type) {
if (type == null) {
- throw new NullPointerException("type");
+ throw new IllegalArgumentException("type");
}
if (type.isEnum()) {
Modified: mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java (original)
+++ mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java Mon May 10 13:06:07 2010
@@ -134,7 +134,7 @@ public class ObjectMBean<T> implements M
*/
public ObjectMBean(T source) {
if (source == null) {
- throw new NullPointerException("source");
+ throw new IllegalArgumentException("source");
}
this.source = source;
@@ -523,7 +523,7 @@ public class ObjectMBean<T> implements M
private boolean isWritable(Class<?> type, PropertyDescriptor pdesc) {
if (type == null) {
- throw new NullPointerException("type");
+ throw new IllegalArgumentException("type");
}
if (pdesc == null) {
return false;
@@ -976,11 +976,11 @@ public class ObjectMBean<T> implements M
protected PropertyEditor getPropertyEditor(Class<?> type, String attrName, Class<?> attrType) {
if (type == null) {
- throw new NullPointerException("type");
+ throw new IllegalArgumentException("type");
}
if (attrName == null) {
- throw new NullPointerException("attrName");
+ throw new IllegalArgumentException("attrName");
}
if (transportMetadata != null && attrType == SocketAddress.class) {
Modified: mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java (original)
+++ mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java Mon May 10 13:06:07 2010
@@ -43,7 +43,7 @@ public class IoSessionFinder {
*/
public IoSessionFinder(String query) {
if (query == null) {
- throw new NullPointerException("query");
+ throw new IllegalArgumentException("query");
}
query = query.trim();
@@ -66,7 +66,7 @@ public class IoSessionFinder {
*/
public Set<IoSession> find(Iterable<IoSession> sessions) throws OgnlException {
if (sessions == null) {
- throw new NullPointerException("sessions");
+ throw new IllegalArgumentException("sessions");
}
Set<IoSession> answer = new LinkedHashSet<IoSession>();
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/BreakAndCallException.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/BreakAndCallException.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/BreakAndCallException.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/BreakAndCallException.java Mon May 10 13:06:07 2010
@@ -37,7 +37,7 @@ class BreakAndCallException extends Brea
public BreakAndCallException(String stateId, String returnToStateId, boolean now) {
if (stateId == null) {
- throw new NullPointerException("stateId");
+ throw new IllegalArgumentException("stateId");
}
this.stateId = stateId;
this.returnToStateId = returnToStateId;
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/BreakAndGotoException.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/BreakAndGotoException.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/BreakAndGotoException.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/BreakAndGotoException.java Mon May 10 13:06:07 2010
@@ -32,7 +32,7 @@ class BreakAndGotoException extends Brea
public BreakAndGotoException(String stateId, boolean now) {
if (stateId == null) {
- throw new NullPointerException("stateId");
+ throw new IllegalArgumentException("stateId");
}
this.stateId = stateId;
this.now = now;
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/State.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/State.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/State.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/State.java Mon May 10 13:06:07 2010
@@ -131,7 +131,7 @@ public class State {
*/
public State addTransition(Transition transition, int weight) {
if (transition == null) {
- throw new NullPointerException("transition");
+ throw new IllegalArgumentException("transition");
}
transitionHolders.add(new TransitionHolder(transition, weight));
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/AbstractStateContextLookup.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/AbstractStateContextLookup.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/AbstractStateContextLookup.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/AbstractStateContextLookup.java Mon May 10 13:06:07 2010
@@ -41,7 +41,7 @@ public abstract class AbstractStateConte
*/
public AbstractStateContextLookup(StateContextFactory contextFactory) {
if (contextFactory == null) {
- throw new NullPointerException("contextFactory");
+ throw new IllegalArgumentException("contextFactory");
}
this.contextFactory = contextFactory;
}
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/SingletonStateContextLookup.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/SingletonStateContextLookup.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/SingletonStateContextLookup.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/SingletonStateContextLookup.java Mon May 10 13:06:07 2010
@@ -45,7 +45,7 @@ public class SingletonStateContextLookup
*/
public SingletonStateContextLookup(StateContextFactory contextFactory) {
if (contextFactory == null) {
- throw new NullPointerException("contextFactory");
+ throw new IllegalArgumentException("contextFactory");
}
context = contextFactory.create();
}
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/Event.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/Event.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/Event.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/Event.java Mon May 10 13:06:07 2010
@@ -55,13 +55,13 @@ public class Event {
*/
public Event(Object id, StateContext context, Object[] arguments) {
if (id == null) {
- throw new NullPointerException("id");
+ throw new IllegalArgumentException("id");
}
if (context == null) {
- throw new NullPointerException("context");
+ throw new IllegalArgumentException("context");
}
if (arguments == null) {
- throw new NullPointerException("arguments");
+ throw new IllegalArgumentException("arguments");
}
this.id = id;
this.context = context;
Modified: mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateTest.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateTest.java (original)
+++ mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateTest.java Mon May 10 13:06:07 2010
@@ -87,8 +87,8 @@ public class StateTest extends RMockTest
public void testAddNullTransitionThrowsException() throws Exception {
try {
state.addTransition(null);
- fail("null transition added. NullPointerException expected.");
- } catch (NullPointerException npe) {
+ fail("null transition added. IllegalArgumentException expected.");
+ } catch (IllegalArgumentException npe) {
}
}
Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialAddress.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialAddress.java?rev=942725&r1=942724&r2=942725&view=diff
==============================================================================
--- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialAddress.java (original)
+++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialAddress.java Mon May 10 13:06:07 2010
@@ -70,7 +70,7 @@ public class SerialAddress extends Socke
public SerialAddress(String name, int bauds, DataBits dataBits,
StopBits stopBits, Parity parity, FlowControl flowControl) {
if (name == null) {
- throw new NullPointerException("name");
+ throw new IllegalArgumentException("name");
}
name = name.trim();
if (name.length() == 0) {
@@ -80,16 +80,16 @@ public class SerialAddress extends Socke
throw new IllegalArgumentException("bauds: " + bauds);
}
if (dataBits == null) {
- throw new NullPointerException("dataBits");
+ throw new IllegalArgumentException("dataBits");
}
if (stopBits == null) {
- throw new NullPointerException("stopBits");
+ throw new IllegalArgumentException("stopBits");
}
if (parity == null) {
- throw new NullPointerException("parity");
+ throw new IllegalArgumentException("parity");
}
if (flowControl == null) {
- throw new NullPointerException("flowControl");
+ throw new IllegalArgumentException("flowControl");
}
this.name = name;