From d5c94e420b846ce896bdef171e172cd1fa1594ea Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 12 Mar 2011 12:09:49 +0100
Subject: [PATCH] fix loop bug and improve logging

---
 .../plugin/scanner/DefaultPluginScanner.java  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/DefaultPluginScanner.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/DefaultPluginScanner.java
index 536a71714a..d33c947b2d 100644
--- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/DefaultPluginScanner.java
+++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/DefaultPluginScanner.java
@@ -62,7 +62,7 @@ public class DefaultPluginScanner implements PluginScanner
 {
 
   /** Field description */
-  public static final String PLUGIN_DESCRIPTOR = "/META-INF/scm/plugin.xml";
+  public static final String PLUGIN_DESCRIPTOR = "META-INF/scm/plugin.xml";
 
   /** Field description */
   public static final String PLUGIN_EXTENSION = ".jar";
@@ -145,6 +145,11 @@ public class DefaultPluginScanner implements PluginScanner
 
       while (entry != null)
       {
+        if (logger.isTraceEnabled())
+        {
+          logger.trace("scann entry {}", entry.getName());
+        }
+
         if (PLUGIN_DESCRIPTOR.equals(entry.getName()))
         {
           Plugin plugin =
@@ -160,12 +165,15 @@ public class DefaultPluginScanner implements PluginScanner
             backend.addPlugin(plugin.getInformation());
           }
 
-          break;
-        } else {
-          entry.getCompressedSize();
-        }
+          inputStream.closeEntry();
 
-        inputStream.closeEntry();
+          break;
+        }
+        else
+        {
+          inputStream.closeEntry();
+          entry = inputStream.getNextJarEntry();
+        }
       }
     }
     catch (Exception ex)