summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-12-03 10:21:30 +0100
committerBenoit Foucher <benoit@zeroc.com>2014-12-03 10:21:30 +0100
commit8a673a56c0902cd9ecdbd15c66563a81a735aae0 (patch)
treeffac4ba61b6d883e3c3c01bd7a12d218aacb83e8 /java/src
parentFixed (ICE-6051) - OS X: rpath not set for demo executables (diff)
downloadice-8a673a56c0902cd9ecdbd15c66563a81a735aae0.tar.bz2
ice-8a673a56c0902cd9ecdbd15c66563a81a735aae0.tar.xz
ice-8a673a56c0902cd9ecdbd15c66563a81a735aae0.zip
Minor fixes (removed OSX/x86 arch from testicedist.py, fixed bogus SUBDIRS assignement in top-level Makefile)
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/src/main/java/IceInternal/AsyncResultI.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/AsyncResultI.java b/java/src/Ice/src/main/java/IceInternal/AsyncResultI.java
index 20b45d42d97..a309ca4a2b9 100644
--- a/java/src/Ice/src/main/java/IceInternal/AsyncResultI.java
+++ b/java/src/Ice/src/main/java/IceInternal/AsyncResultI.java
@@ -300,7 +300,7 @@ public class AsyncResultI implements AsyncResult
{
synchronized(this)
{
- if (_exception != null) { _exception.printStackTrace(); assert(false); }
+ assert(_exception == null);
boolean alreadySent = (_state & StateSent) != 0;
_state |= StateSent;