fix possible nullpointerexception

This commit is contained in:
Sebastian Sdorra
2012-03-25 13:05:49 +02:00
parent 9088b8cf45
commit e2b137ba6a

View File

@@ -41,6 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.util.AssertUtil; import sonia.scm.util.AssertUtil;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
@@ -49,6 +50,7 @@ import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@@ -218,28 +220,39 @@ public class ClassOverrides implements Iterable<ClassOverride>
*/ */
public List<? extends Module> getModules() public List<? extends Module> getModules()
{ {
return Lists.transform(moduleClasses, List<? extends Module> modules = null;
new Function<Class<? extends Module>, Module>()
if (Util.isNotEmpty(moduleClasses))
{ {
@Override modules = Lists.transform(moduleClasses,
public Module apply(Class<? extends Module> moduleClass) new Function<Class<? extends Module>, Module>()
{ {
Module module = null; @Override
public Module apply(Class<? extends Module> moduleClass)
try
{ {
module = moduleClass.newInstance(); Module module = null;
}
catch (Exception ex)
{
logger.error(
"could not create module instance of ".concat(
moduleClass.getName()), ex);
}
return module; try
} {
}); module = moduleClass.newInstance();
}
catch (Exception ex)
{
logger.error(
"could not create module instance of ".concat(
moduleClass.getName()), ex);
}
return module;
}
});
}
else
{
modules = Collections.EMPTY_LIST;
}
return modules;
} }
/** /**