Changeset 2172 for trunk/java-client

Timestamp:

2001-03-14T04:01:40+13:00 (23 years ago)

Author:

cs025

Message:

Changed ping parameters and behaviour in C++; corresponding changes
made in java client.

Location:

trunk/java-client

Files:

• corbaiface.idl (modified) (1 diff)
• org/nzdl/gsdl/service/NzdlServiceClient.java (modified) (1 diff)
• org/nzdl/gsdl/service/NzdlServiceServer.java (modified) (2 diffs)

trunk/java-client/corbaiface.idl

@@ -208 +208 @@
   void      hasCollection(in corbatext_t corbaCollection, inout boolean has,
                inout corbaComError error);
-  boolean   ping(in corbatext_t collection, inout corbaComError error);
+  void      ping(in corbatext_t collection, inout boolean wasSuccess, inout corbaComError error);
   void      getDocument(in corbatext_t collection,
             inout corbaDocRequest request, inout corbaDocResponse response,

trunk/java-client/org/nzdl/gsdl/service/NzdlServiceClient.java

@@ -171 +171 @@
     }
     corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
-    boolean result  = m_nzdlServer.ping( NzdlCorbaFactory.toCorbaText(_name), c_err );
+    org.omg.CORBA.BooleanHolder c_ping = new org.omg.CORBA.BooleanHolder();
+    m_nzdlServer.ping( NzdlCorbaFactory.toCorbaText(_name), c_ping, c_err );
     if (c_err.value.value() != 0)
       System.err.println("pingCollection() error " + c_err.value.value());
-    return result;
+    return c_ping.value;
   }
 

trunk/java-client/org/nzdl/gsdl/service/NzdlServiceServer.java

@@ -142 +142 @@
     return;
   }
+
   /**
    * Is the collection avalibale for use?
@@ -148 +149 @@
    *    <tt>false</tt> otherwise
    */
-  public boolean ping (corbatext_t collection, 
-               corbaComErrorHolder error) {
+  public void ping (corbatext_t collection, 
+            org.omg.CORBA.BooleanHolder has,            
+            corbaComErrorHolder error) {
     String name = NzdlCorbaFactory.toString(collection);
-    return  nzdl.hasCollection(name);
+    has.value = nzdl.hasCollection(name);
   }