#240403 - GlassFish registration removed after restart when registered by installer release80_beta
authorPetr Hejl <phejl@netbeans.org>
Tue, 14 Jan 2014 10:27:44 +0100
branchrelease80_beta
changeset 279229d6258d35641d
parent 279123 03f76a8fe419
#240403 - GlassFish registration removed after restart when registered by installer
(transplanted from add2166c0cda950025a0dcc139144914e4936a03)
glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java
     1.1 --- a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java	Mon Jan 13 14:56:39 2014 +0100
     1.2 +++ b/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java	Tue Jan 14 10:27:44 2014 +0100
     1.3 @@ -655,9 +655,9 @@
     1.4              FileObject[] instanceFOs = dir.getChildren();
     1.5              FileObject instanceFO = null;
     1.6  
     1.7 -            for(int i = 0; i < instanceFOs.length; i++) {
     1.8 -                if(url.equals(instanceFOs[i]
     1.9 -                        .getAttribute(GlassfishModule.URL_ATTR))) {
    1.10 +            for (int i = 0; i < instanceFOs.length; i++) {
    1.11 +                if (url.equals(instanceFOs[i].getAttribute(GlassfishModule.URL_ATTR))
    1.12 +                        && !GlassfishInstanceProvider.GLASSFISH_AUTOREGISTERED_INSTANCE.equals(instanceFOs[i].getName())) {
    1.13                      instanceFO = instanceFOs[i];
    1.14                  }
    1.15              }