Always attempt to delete lib dir first. This makes plugin unloading much cleaner.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4179 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/container/PluginManager.java

@@ -826,8 +826,9 @@ public class PluginManager {
                         else if (file2.getName().equals("admin")) {
                             return 1;
                         }
-                        else
+                        else {
                             return file1.compareTo(file2);
+                        }
                     }
                 });
 
@@ -933,7 +934,24 @@ public class PluginManager {
          */
         public boolean deleteDir(File dir) {
             if (dir.isDirectory()) {
-                String[] children = dir.list();
+                String[] childDirs = dir.list();
+                // Always try to delete JAR files first since that's what will
+                // be under contention. We do this by always sorting the lib directory
+                // first.
+                List<String> children = new ArrayList<String>(Arrays.asList(childDirs));
+                Collections.sort(children, new Comparator<String>() {
+                    public int compare(String o1, String o2) {
+                        if (o1.equals("lib")) {
+                            return -1;
+                        }
+                        if (o2.equals("lib")) {
+                            return 1;
+                        }
+                        else {
+                            return o1.compareTo(o2);
+                        }
+                    }
+                });
                 for (String file : children) {
                     boolean success = deleteDir(new File(dir, file));
                     if (!success) {