summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2005-08-10 17:56:54 +0000
committerBernard Normier <bernard@zeroc.com>2005-08-10 17:56:54 +0000
commit18d6cb4dce9c2da7bac2f5d37eb64bc143afab3c (patch)
tree56d1ffedfc846074c1170472ad7147185036a193
parentfixed node observer updates (diff)
downloadice-18d6cb4dce9c2da7bac2f5d37eb64bc143afab3c.tar.bz2
ice-18d6cb4dce9c2da7bac2f5d37eb64bc143afab3c.tar.xz
ice-18d6cb4dce9c2da7bac2f5d37eb64bc143afab3c.zip
java metadata
-rw-r--r--cpp/slice/IceGrid/Descriptor.ice2
-rw-r--r--cpp/slice/IceGrid/Observer.ice1
2 files changed, 2 insertions, 1 deletions
diff --git a/cpp/slice/IceGrid/Descriptor.ice b/cpp/slice/IceGrid/Descriptor.ice
index 60c23183482..951d0570935 100644
--- a/cpp/slice/IceGrid/Descriptor.ice
+++ b/cpp/slice/IceGrid/Descriptor.ice
@@ -417,7 +417,7 @@ struct ReplicatedAdapterDescriptor
**/
ObjectDescriptorSeq objects;
};
-sequence<ReplicatedAdapterDescriptor> ReplicatedAdapterDescriptorSeq;
+["java:type:java.util.LinkedList"] sequence<ReplicatedAdapterDescriptor> ReplicatedAdapterDescriptorSeq;
/**
*
diff --git a/cpp/slice/IceGrid/Observer.ice b/cpp/slice/IceGrid/Observer.ice
index 36627fcf148..2eb16275d5a 100644
--- a/cpp/slice/IceGrid/Observer.ice
+++ b/cpp/slice/IceGrid/Observer.ice
@@ -28,6 +28,7 @@ sequence<ServerDynamicInfo> ServerDynamicInfoSeq;
struct AdapterDynamicInfo
{
string id;
+ // string serverId;
Object* proxy;
};
sequence<AdapterDynamicInfo> AdapterDynamicInfoSeq;