Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigDataLoader.java =================================================================== RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigDataLoader.java,v retrieving revision 1.8 diff -u -r1.8 ConfigDataLoader.java --- j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigDataLoader.java 20 Aug 2004 23:36:31 -0000 1.8 +++ j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigDataLoader.java 25 Aug 2004 15:18:18 -0000 @@ -105,14 +105,18 @@ // never recognize folders. if (fo.isFolder()) return null; - String ext = fo.getExt(); - String primaryPath = getPrimaryByName(fo.getNameExt ()); FileObject primaryFO = null; String secondPrimaryName = null; - if (primaryPath != null || ext.equals(GENERIC_EXTENSION)) { + if (GENERIC_EXTENSION.equals(fo.getExt())) { primaryFO = fo; - } else { // check for secondary file and load its primary - secondPrimaryName = getPrimaryBySecondaryName (fo.getNameExt ()); + } + else { + String nameExt = fo.getNameExt (); + if (getPrimaryByName(nameExt) != null) { + primaryFO = fo; + } else { // check for secondary file and load its primary + secondPrimaryName = getPrimaryBySecondaryName (nameExt); + } } if (primaryFO == null && secondPrimaryName == null)