From cedb32b6b7a799ef4142b418e64d3538cf604af1 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 5 Jun 2014 14:13:37 +0200 Subject: Recreate old Authenticator interface as 'ProxyLogin' Server boots with new lookup interface. --- src/main/java/com/c2kernel/utils/ObjectProperties.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/c2kernel/utils/ObjectProperties.java') diff --git a/src/main/java/com/c2kernel/utils/ObjectProperties.java b/src/main/java/com/c2kernel/utils/ObjectProperties.java index 1e9db8b..731b009 100644 --- a/src/main/java/com/c2kernel/utils/ObjectProperties.java +++ b/src/main/java/com/c2kernel/utils/ObjectProperties.java @@ -151,11 +151,17 @@ public class ObjectProperties extends Properties { } } - public Object getInstance(String propName) throws InstantiationException, IllegalAccessException, ClassNotFoundException { - Object prop = getObject(propName); + public Object getInstance(String propName, Object defaultVal) throws InstantiationException, IllegalAccessException, ClassNotFoundException { + Object prop = getObject(propName, defaultVal); + if (prop == null || prop.equals("")) + throw new InstantiationException("Property '"+propName+"' was not defined. Cannot instantiate."); if (prop instanceof String) return Class.forName((String)prop).newInstance(); return prop; + } + + public Object getInstance(String propName) throws InstantiationException, IllegalAccessException, ClassNotFoundException { + return getInstance(propName, null); } } -- cgit v1.2.3