diff -r eeb783e79897 glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java --- a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java Mon Aug 11 11:21:39 2014 +0200 +++ b/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java Mon Aug 11 23:41:39 2014 +0200 @@ -442,7 +442,7 @@ GlassFishVersion version = ServerUtils.getServerVersion( ip.get(GlassfishModule.GLASSFISH_FOLDER_ATTR)); try { - instance = new GlassfishInstance(ip, version, gip); + instance = new GlassfishInstance(ip, version, gip, updateNow); tagUnderConstruction(deployerUri); if (!instance.isPublicAccess()) { instance.ic.add(instance.commonSupport); @@ -584,7 +584,7 @@ * @throws IOException */ public static GlassfishInstance readInstanceFromFile( - FileObject instanceFO) throws IOException { + FileObject instanceFO, boolean autoregistered) throws IOException { GlassfishInstance instance = null; String installRoot @@ -618,7 +618,7 @@ } ip.put(INSTANCE_FO_ATTR, instanceFO.getName()); fixImportedAttributes(ip, instanceFO); - instance = create(ip,GlassfishInstanceProvider.getProvider(),false); + instance = create(ip,GlassfishInstanceProvider.getProvider(), autoregistered); } else { LOGGER.log(Level.FINER, "GlassFish folder {0} is not a valid install.", @@ -760,7 +760,7 @@ @SuppressWarnings("LeakingThisInConstructor") private GlassfishInstance(Map ip, GlassFishVersion version, - GlassfishInstanceProvider instanceProvider) { + GlassfishInstanceProvider instanceProvider, boolean prepareProperties) { this.version = version; this.process = null; ic = new InstanceContent(); @@ -783,7 +783,11 @@ } else { domainXMLListener = null; } - this.properties = prepareProperties(ip); + if (prepareProperties) { + this.properties = prepareProperties(ip); + } else { + this.properties = new Props(ip); + } if (!isPublicAccess()) { // Add this instance into local lookup (to find instance from // node lookup). diff -r eeb783e79897 glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java --- a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java Mon Aug 11 11:21:39 2014 +0200 +++ b/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java Mon Aug 11 23:41:39 2014 +0200 @@ -455,7 +455,7 @@ continue; } GlassfishInstance si = GlassfishInstance - .readInstanceFromFile(instanceFOs[i]); + .readInstanceFromFile(instanceFOs[i], false); if (si != null) { activeDisplayNames.add(si.getDisplayName()); } else { @@ -475,7 +475,7 @@ .get(AUTOINSTANCECOPIED, null)) { try { GlassfishInstance igi = GlassfishInstance. - readInstanceFromFile(installedInstance); + readInstanceFromFile(installedInstance, true); try { NbPreferences.forModule(this.getClass()) .put(AUTOINSTANCECOPIED, "true"); // NOI18N