summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Torre <neugens@limasoftware.net>2008-08-22 14:28:06 +0000
committerMario Torre <neugens@limasoftware.net>2008-08-22 14:28:06 +0000
commit4971bbf18a0037f825c92f176fdbe2e365d85435 (patch)
tree412bd9f8eacebe69fec2fba542aa4e4d9bed4f5f
parent3571024399742c8d5533c12cf0287cf15eb8cd4a (diff)
downloadclasspath-4971bbf18a0037f825c92f176fdbe2e365d85435.tar.gz
2008-08-22 Mario Torre <neugens@aicas.com>
* gnu/CORBA/OrbFunctional.java (set_parameters): Fix NullPointerException checking when param is null.
-rw-r--r--ChangeLog5
-rw-r--r--gnu/CORBA/OrbFunctional.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 338b33c19..c8eb8f84c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-22 Mario Torre <neugens@aicas.com>
+
+ * gnu/CORBA/OrbFunctional.java (set_parameters): Fix
+ NullPointerException checking when param is null.
+
2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
diff --git a/gnu/CORBA/OrbFunctional.java b/gnu/CORBA/OrbFunctional.java
index 8fddc6627..25344cb2e 100644
--- a/gnu/CORBA/OrbFunctional.java
+++ b/gnu/CORBA/OrbFunctional.java
@@ -1194,7 +1194,7 @@ public class OrbFunctional extends OrbRestricted
*/
protected void set_parameters(String[] para, Properties props)
{
- if (para.length > 1)
+ if ((para != null) && para.length > 1)
{
for (int i = 0; i < para.length - 1; i++)
{