Merge pull request #1173 from olamy/not-try-to-load-non-existing-files-improved

improve a bit previous commit

core/src/main/java/hudson/model/ItemGroupMixIn.java

@@ -24,6 +24,7 @@
 package hudson.model;
 
 import hudson.Util;
+import hudson.XmlFile;
 import hudson.model.listeners.ItemListener;
 import hudson.remoting.Callable;
 import hudson.security.AccessControlled;
@@ -93,7 +94,7 @@ public abstract class ItemGroupMixIn {
 
         File[] subdirs = modulesDir.listFiles(new FileFilter() {
             public boolean accept(File child) {
-                return child.isDirectory() && new File(child,"config.xml").exists();
+                return child.isDirectory();
             }
         });
         CopyOnWriteMap.Tree<K,V> configurations = new CopyOnWriteMap.Tree<K,V>();
@@ -102,7 +103,12 @@ public abstract class ItemGroupMixIn {
                 // Try to retain the identity of an existing child object if we can.
                 V item = (V) parent.getItem(subdir.getName());
                 if (item == null) {
-                    item = (V) Items.load(parent,subdir);
+                    XmlFile xmlFile = Items.getConfigFile( subdir );
+                    if (xmlFile.exists()) {
+                        item = (V) Items.load( parent, subdir );
+                    }else{
+                        Logger.getLogger( ItemGroupMixIn.class.getName() ).log( Level.WARNING, "could not find file " + xmlFile.getFile());
+                    }
                 } else {
                     item.onLoad(parent, subdir.getName());
                 }

core/src/main/java/hudson/model/Items.java

@@ -42,6 +42,8 @@ import org.apache.commons.lang.StringUtils;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.annotation.CheckForNull;
 import jenkins.model.DirectlyModifiableTopLevelItemGroup;
 import org.apache.commons.io.FileUtils;