diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-09-20 15:55:05 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-09-20 15:55:05 -0400 |
| commit | f185946cfbced2bf5e6bf8deb0993a18057664d5 (patch) | |
| tree | 8a2de32151d5dc71bd0353feefa21de018e85f2f /java/src | |
| parent | fix for compilation errors with Python 2.5 (diff) | |
| download | ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.tar.bz2 ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.tar.xz ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.zip | |
Squashed commit of the following:
commit 2eba3087584d54d3ba98ef50724710fd34d84e0b
Author: Bernard Normier <bernard@zeroc.com>
Date: Thu Sep 20 15:53:49 2007 -0400
New ice-version attribute, IceGrid now generates Ice.Admin.* properties
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceInternal/Instance.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index ebad61f8f70..b29f3912414 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -594,12 +594,12 @@ public final class Instance if((defaultLocator != null && serverId.length() > 0) || instanceName.length() > 0) { - _adminIdentity.name = "admin"; if(instanceName.length() == 0) { instanceName = Ice.Util.generateUUID(); } - _adminIdentity.category = instanceName; + + _adminIdentity = new Ice.Identity("admin", instanceName); // // Create OA |