From: Byron Nevins <Byron.Nevins_at_Sun.COM>
Date: Sun, 03 Dec 2006 21:52:51 -0800

Bug: 1558

Fix:

Index:
src/java/com/sun/enterprise/admin/servermgmt/pe/PEInstancesManager.java
===================================================================
RCS file:
/cvs/glassfish/admin/servermgmt/src/java/com/sun/enterprise/admin/servermgmt/pe/PEInstancesManager.java,v
retrieving revision 1.11
diff -u -r1.11 PEInstancesManager.java

---
src/java/com/sun/enterprise/admin/servermgmt/pe/PEInstancesManager.java	21
Nov 2006 20:53:12 -0000	1.11
+++
src/java/com/sun/enterprise/admin/servermgmt/pe/PEInstancesManager.java	4
Dec 2006 05:21:39 -0000
@@ -820,7 +820,15 @@
     {
         // if the username and admin password are empty or null
strings, don't mess with writing to the stdin of
         // the AS process eventually
-        if(securityInfo != null && securityInfo.length >= 3 &&
ok(securityInfo[0]) && ok(securityInfo[1]))
+        // BUT *do* write them if master pw != null
+        // Issue 1558
+        // Note that the master password, currently, will ALWAYS be set
to either what the
+        // user types in -- or "changeit"
+        
+        boolean gotATLeastOne = securityInfo != null &&
securityInfo.length >= 3 && 
+                (ok(securityInfo[0]) || ok(securityInfo[1]) ||
ok(securityInfo[2]));
+
+        if(gotATLeastOne)
         {
             System.setProperty("com.sun.aas.promptForIdentity",
"true");                    
         }