1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java
index 0e5c52ab490..8331cf7ffa6 100755
--- a/java/src/IceGridGUI/Application/AdapterEditor.java
+++ b/java/src/IceGridGUI/Application/AdapterEditor.java
@@ -515,13 +515,15 @@ class AdapterEditor extends CommunicatorChildEditor
         _priority.setText(Utils.substitute(descriptor.priority, resolver));
         _priority.setEditable(isEditable);
         
-        if(adapter.isEphemeral())
+        String endpoints = Utils.substitute(adapter.getProperty(oaPrefix + "Endpoints"), resolver);
+        
+        if(adapter.isEphemeral() && (endpoints == null || endpoints.equals("")))
         {
             _endpoints.setText("default");
         }
         else
         {
-            _endpoints.setText(Utils.substitute(adapter.getProperty(oaPrefix + "Endpoints"), resolver));
+            _endpoints.setText(endpoints);
         }
         _endpoints.setEditable(isEditable);