From 49e74b1e52dcf8aa320b2ad74ddda5172b4a1c88 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 7 Feb 2002 08:57:44 +0000 Subject: [PATCH] Use indirection to get ClassLoader. Make sure the ClassLoader passed in via constructor is not null - if it is throw a null pointer exception then to help draw out source of error. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271196 13f79535-47bb-0310-9956-ffa450edef68 --- .../interfaces/type/DefaultTypeFactory.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java index 1b2c0a102..0c79ebfaa 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java @@ -31,6 +31,11 @@ public class DefaultTypeFactory public DefaultTypeFactory( final ClassLoader classLoader ) { + if( null == classLoader ) + { + throw new NullPointerException( "classLoader" ); + } + m_classLoader = classLoader; } @@ -50,10 +55,11 @@ public class DefaultTypeFactory throws TypeException { final String className = getClassName( name ); - try { - return m_classLoader.loadClass( className ).newInstance(); + final ClassLoader classLoader = getClassLoader(); + final Class clazz = classLoader.loadClass( className ); + return clazz.newInstance(); } catch( final Exception e ) { @@ -66,7 +72,6 @@ public class DefaultTypeFactory throws TypeException { final String className = (String)m_classNames.get( name ); - if( null == className ) { final String message = REZ.getString( "no-mapping.error", name ); @@ -75,4 +80,9 @@ public class DefaultTypeFactory return className; } + + private ClassLoader getClassLoader() + { + return m_classLoader; + } }