diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-07-23 15:06:02 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-07-23 15:06:02 -0230 |
| commit | 866f9ff17391176b836f9bb49f6da40c2c938441 (patch) | |
| tree | 7366963294ef3356c7b887cd89af753988c21beb /java/src/Ice/AsyncResult.java | |
| parent | adding ACM tests for Python/Ruby/PHP (diff) | |
| download | ice-866f9ff17391176b836f9bb49f6da40c2c938441.tar.bz2 ice-866f9ff17391176b836f9bb49f6da40c2c938441.tar.xz ice-866f9ff17391176b836f9bb49f6da40c2c938441.zip | |
ICE-4234 - Update Ice to use current Java threading constructs
- Use ScheduledThreadPoolDispatcher not IceUtilInternal.Timer.
- Use Ice timer in glacier2, Freeze impl.
- Align C++, C# with java changes.
- Database demo now supports mariadb.
Diffstat (limited to 'java/src/Ice/AsyncResult.java')
| -rw-r--r-- | java/src/Ice/AsyncResult.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/Ice/AsyncResult.java b/java/src/Ice/AsyncResult.java index 8667a1afb88..de8c225d910 100644 --- a/java/src/Ice/AsyncResult.java +++ b/java/src/Ice/AsyncResult.java @@ -517,6 +517,7 @@ public class AsyncResult protected IceInternal.BasicStream _os; protected IceInternal.RequestHandler _timeoutRequestHandler; + protected java.util.concurrent.Future<?> _future; protected static final byte OK = 0x1; protected static final byte Done = 0x2; |