| commit | 65f35ef479cbfca44f7d2245d4601a4e10494563 | [log] [tgz] |
|---|---|---|
| author | Niklas Gustavsson <ngn@apache.org> | Wed Jun 01 13:07:00 2011 +0000 |
| committer | Niklas Gustavsson <ngn@apache.org> | Wed Jun 01 13:07:00 2011 +0000 |
| tree | 7e4b1eb69311a58164237c71c06ebf971de3723f | |
| parent | fe585531f83b26e6c92644e0386f201e3deec27e [diff] |
Doing an explicit null check in PassivePorts (FTPSERVER-415) git-svn-id: https://svn.apache.org/repos/asf/mina/ftpserver/trunk@1130138 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java b/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java index f539540..19585ec 100644 --- a/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java +++ b/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java
@@ -158,11 +158,11 @@ } public PassivePorts(final int[] passivePorts, boolean checkIfBound) { - if (passivePorts != null) { - this.passivePorts = passivePorts.clone(); - } else { - this.passivePorts = null; - } + if(passivePorts == null) { + throw new NullPointerException("passivePorts can not be null"); + } + + this.passivePorts = passivePorts.clone(); reservedPorts = new boolean[passivePorts.length]; this.checkIfBound = checkIfBound;
diff --git a/core/src/test/java/org/apache/ftpserver/impl/PassivePortsTest.java b/core/src/test/java/org/apache/ftpserver/impl/PassivePortsTest.java index 57021de..1167e20 100644 --- a/core/src/test/java/org/apache/ftpserver/impl/PassivePortsTest.java +++ b/core/src/test/java/org/apache/ftpserver/impl/PassivePortsTest.java
@@ -203,4 +203,12 @@ assertEquals(-1, ports.reserveNextPort()); } + public void testNullPorts() { + try { + new PassivePorts((int[])null, false); + fail("Must throw NPE"); + } catch(NullPointerException e) { + // ok + } + } }