--- a/flys-artifacts/src/main/java/de/intevation/flys/themes/ThemeFactory.java	Sat Jul 28 20:58:42 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/themes/ThemeFactory.java	Sat Jul 28 21:48:15 2012 +0000
@@ -74,7 +74,10 @@
         String output,
         String groupName)
     {
-        logger.debug("Search theme for: " + name + " - pattern: " + pattern);
+        if (logger.isDebugEnabled()) {
+            logger.debug(
+                "Search theme for: " + name + " - pattern: " + pattern);
+        }
 
         if (c == null || name == null) {
             logger.warn("Cannot search for theme.");
@@ -92,8 +95,9 @@
 
         ThemeGroup group = null;
         for (ThemeGroup tg: tgs) {
-            if(tg.getName().equals(groupName)) {
+            if (tg.getName().equals(groupName)) {
                 group = tg;
+                break;
             }
         }
 
@@ -105,7 +109,7 @@
 
         FLYSArtifact artifact = (FLYSArtifact) c.get(FLYSContext.ARTIFACT_KEY);
 
-        if (map == null || map.size() == 0 || t == null || t.size() == 0) {
+        if (map == null || map.isEmpty() || t == null || t.isEmpty()) {
             logger.warn("No mappings or themes found. Cannot retrieve theme!");
             return null;
         }