summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2015-01-13 15:33:16 -0330
committerMatthew Newhook <matthew@zeroc.com>2015-01-13 15:33:16 -0330
commit024b7ad85bffcaa9f0f4b98dedf04ee45b4ccb9e (patch)
treed1504d25f3c1112996d02aed5716f7898334f1a9
parentFix bug with oneway invocations in the android hello demo. (diff)
downloadice-024b7ad85bffcaa9f0f4b98dedf04ee45b4ccb9e.tar.bz2
ice-024b7ad85bffcaa9f0f4b98dedf04ee45b4ccb9e.tar.xz
ice-024b7ad85bffcaa9f0f4b98dedf04ee45b4ccb9e.zip
Fix another bug with hello demos.
-rw-r--r--android/demo/hello/src/main/java/com/zeroc/hello/DeliveryMode.java2
-rw-r--r--java/demo/Ice/applet/HelloApplet.java2
-rw-r--r--java/demo/Ice/swing/Client.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/android/demo/hello/src/main/java/com/zeroc/hello/DeliveryMode.java b/android/demo/hello/src/main/java/com/zeroc/hello/DeliveryMode.java
index c7a67dd011f..19d298d828c 100644
--- a/android/demo/hello/src/main/java/com/zeroc/hello/DeliveryMode.java
+++ b/android/demo/hello/src/main/java/com/zeroc/hello/DeliveryMode.java
@@ -53,7 +53,7 @@ enum DeliveryMode
public boolean isOneway()
{
- return this == ONEWAY || this == ONEWAY_SECURE;
+ return this == ONEWAY || this == ONEWAY_SECURE || this == DATAGRAM;
}
public boolean isBatch()
{
diff --git a/java/demo/Ice/applet/HelloApplet.java b/java/demo/Ice/applet/HelloApplet.java
index 244b7debfc0..00b05c20dba 100644
--- a/java/demo/Ice/applet/HelloApplet.java
+++ b/java/demo/Ice/applet/HelloApplet.java
@@ -395,7 +395,7 @@ public class HelloApplet extends JApplet
public boolean isOneway()
{
- return this == ONEWAY || this == ONEWAY_SECURE;
+ return this == ONEWAY || this == ONEWAY_SECURE || this == DATAGRAM;
}
public boolean isBatch()
diff --git a/java/demo/Ice/swing/Client.java b/java/demo/Ice/swing/Client.java
index f06ade4cf27..c4530badc0a 100644
--- a/java/demo/Ice/swing/Client.java
+++ b/java/demo/Ice/swing/Client.java
@@ -433,7 +433,7 @@ public class Client extends JFrame
public boolean isOneway()
{
- return this == ONEWAY || this == ONEWAY_SECURE;
+ return this == ONEWAY || this == ONEWAY_SECURE || this == DATAGRAM;
}
public boolean isBatch()