From 2d8cf20d0d5ca6b1fbdefc22229d4b7cf1497ede Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 17 Jan 2006 18:09:40 +0000 Subject: Imported GNU Classpath 0.20 * Makefile.am (AM_CPPFLAGS): Add classpath/include. * java/nio/charset/spi/CharsetProvider.java: New override file. * java/security/Security.java: Likewise. * sources.am: Regenerated. * Makefile.in: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109831 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/gnu/java/security/Engine.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libjava/classpath/gnu/java/security') diff --git a/libjava/classpath/gnu/java/security/Engine.java b/libjava/classpath/gnu/java/security/Engine.java index b75de5caa95..4b6bd10d9dd 100644 --- a/libjava/classpath/gnu/java/security/Engine.java +++ b/libjava/classpath/gnu/java/security/Engine.java @@ -1,5 +1,5 @@ /* Engine -- generic getInstance method. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -130,7 +130,14 @@ public final class Engine Provider provider, Object[] initArgs) throws InvocationTargetException, NoSuchAlgorithmException { - if (service == null || algorithm == null + if (service != null) + service = service.trim(); + + if (algorithm != null) + algorithm = algorithm.trim(); + + if (service == null || service.length() == 0 + || algorithm == null || algorithm.length() == 0 || provider == null || initArgs == null) throw new IllegalArgumentException(); -- cgit v1.2.3