property fixes

1 files changed, 21 insertions, 41 deletions

diff --git a/java/demo/Ice/callback/CallbackClient.java b/java/demo/Ice/callback/CallbackClient.java
index b79b938016d..70789ed007d 100644
--- a/java/demo/Ice/callback/CallbackClient.java
+++ b/java/demo/Ice/callback/CallbackClient.java
@@ -33,44 +33,35 @@ class CallbackClient extends Ice.Application
         Ice.Properties properties = communicator().getProperties();
         final String refProperty = "Callback.Callback";
         String ref = properties.getProperty(refProperty);
-        if (ref == null)
+        if (ref.length() == 0)
         {
             System.err.println("property `" + refProperty + "' not set");
             return 1;
         }
 
         Ice.ObjectPrx base = communicator().stringToProxy(ref);
-        CallbackPrx twoway = CallbackPrxHelper.checkedCast(
-            base.ice_twoway().ice_timeout(-1).ice_secure(false));
+        CallbackPrx twoway = CallbackPrxHelper.checkedCast(base.ice_twoway().ice_timeout(-1).ice_secure(false));
         if (twoway == null)
         {
             System.err.println("invalid object reference");
             return 1;
         }
-        CallbackPrx oneway =
-            CallbackPrxHelper.uncheckedCast(twoway.ice_oneway());
-        CallbackPrx batchOneway =
-            CallbackPrxHelper.uncheckedCast(twoway.ice_batchOneway());
-        CallbackPrx datagram =
-            CallbackPrxHelper.uncheckedCast(twoway.ice_datagram());
-        CallbackPrx batchDatagram =
-            CallbackPrxHelper.uncheckedCast(twoway.ice_batchDatagram());
+        CallbackPrx oneway = CallbackPrxHelper.uncheckedCast(twoway.ice_oneway());
+        CallbackPrx batchOneway = CallbackPrxHelper.uncheckedCast(twoway.ice_batchOneway());
+        CallbackPrx datagram = CallbackPrxHelper.uncheckedCast(twoway.ice_datagram());
+        CallbackPrx batchDatagram = CallbackPrxHelper.uncheckedCast(twoway.ice_batchDatagram());
 
-        Ice.ObjectAdapter adapter =
-            communicator().createObjectAdapter("CallbackReceiverAdapter");
-        adapter.add(new CallbackReceiverI(),
-                    Ice.Util.stringToIdentity("callbackReceiver"));
+        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackReceiverAdapter");
+        adapter.add(new CallbackReceiverI(), Ice.Util.stringToIdentity("callbackReceiver"));
         adapter.activate();
 
         CallbackReceiverPrx twowayR =
             CallbackReceiverPrxHelper.uncheckedCast(adapter.createProxy(
                 Ice.Util.stringToIdentity("callbackReceiver")));
-        CallbackReceiverPrx onewayR =
-            CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_oneway());
+        CallbackReceiverPrx onewayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_oneway());
         //CallbackReceiverPrx batchOnewayR =
         //    CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_batchOneway());
-        CallbackReceiverPrx datagramR =
-            CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_datagram());
+        CallbackReceiverPrx datagramR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_datagram());
         //CallbackReceiverPrx batchDatagramR =
         //    CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_batchDatagram());
 
@@ -79,8 +70,7 @@ class CallbackClient extends Ice.Application
 
         menu();
 
-        java.io.BufferedReader in = new java.io.BufferedReader(
-            new java.io.InputStreamReader(System.in));
+        java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(System.in));
 
         String line = null;
         do
@@ -134,27 +124,17 @@ class CallbackClient extends Ice.Application
                     secure = !secure;
                     secureStr = secure ? "s" : "";
 
-                    twoway = CallbackPrxHelper.uncheckedCast(
-                        twoway.ice_secure(secure));
-                    oneway = CallbackPrxHelper.uncheckedCast(
-                        oneway.ice_secure(secure));
-                    batchOneway = CallbackPrxHelper.uncheckedCast(
-                        batchOneway.ice_secure(secure));
-                    datagram = CallbackPrxHelper.uncheckedCast(
-                        datagram.ice_secure(secure));
-                    batchDatagram = CallbackPrxHelper.uncheckedCast(
-                        batchDatagram.ice_secure(secure));
+                    twoway = CallbackPrxHelper.uncheckedCast(twoway.ice_secure(secure));
+                    oneway = CallbackPrxHelper.uncheckedCast(oneway.ice_secure(secure));
+                    batchOneway = CallbackPrxHelper.uncheckedCast(batchOneway.ice_secure(secure));
+                    datagram = CallbackPrxHelper.uncheckedCast(datagram.ice_secure(secure));
+                    batchDatagram = CallbackPrxHelper.uncheckedCast(batchDatagram.ice_secure(secure));
 
-                    twowayR = CallbackReceiverPrxHelper.uncheckedCast(
-                        twowayR.ice_secure(secure));
-                    onewayR = CallbackReceiverPrxHelper.uncheckedCast(
-                        onewayR.ice_secure(secure));
-                    //batchOnewayR = CallbackReceiverPrxHelper.uncheckedCast(
-                        //batchOnewayR.ice_secure(secure));
-                    datagramR = CallbackReceiverPrxHelper.uncheckedCast(
-                        datagramR.ice_secure(secure));
-                    //batchDatagramR = CallbackReceiverPrxHelper.uncheckedCast(
-                        //batchDatagramR.ice_secure(secure));
+                    twowayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_secure(secure));
+                    onewayR = CallbackReceiverPrxHelper.uncheckedCast(onewayR.ice_secure(secure));
+                    //batchOnewayR = CallbackReceiverPrxHelper.uncheckedCast(batchOnewayR.ice_secure(secure));
+                    datagramR = CallbackReceiverPrxHelper.uncheckedCast(datagramR.ice_secure(secure));
+                    //batchDatagramR = CallbackReceiverPrxHelper.uncheckedCast(batchDatagramR.ice_secure(secure));
 
                     if (secure)
                     {