From 2619a63c21ec173acb0c06c509b2b0c42616b6b1 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 24 Mar 2014 20:33:01 +0100 Subject: [PATCH] Log loaded classes by SmackConfiguration --- .../smack/SmackConfiguration.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java index 16f360225..0baca90df 100644 --- a/core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java +++ b/core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java @@ -322,14 +322,10 @@ public final class SmackConfiguration { } private static void loadSmackClass(String className, boolean optional) throws Exception { - // Attempt to load the class so that the class can get initialized + Class initClass; try { - Class initClass = Class.forName(className); - - if (SmackInitializer.class.isAssignableFrom(initClass)) { - SmackInitializer initializer = (SmackInitializer) initClass.newInstance(); - initializer.initialize(); - } + // Attempt to load the class so that the class can get initialized + initClass = Class.forName(className); } catch (ClassNotFoundException cnfe) { Level logLevel; @@ -341,8 +337,18 @@ public final class SmackConfiguration { } LOGGER.log(logLevel, "A startup class [" + className + "] specified in smack-config.xml could not be loaded: "); - if (!optional) + if (!optional) { throw cnfe; + } else { + return; + } + } + if (SmackInitializer.class.isAssignableFrom(initClass)) { + SmackInitializer initializer = (SmackInitializer) initClass.newInstance(); + initializer.initialize(); + LOGGER.log(Level.FINE, "Loaded SmackInitializer " + className); + } else { + LOGGER.log(Level.FINE, "Loaded " + className); } } }