diff options
author | Jose <jose@zeroc.com> | 2016-10-11 17:08:29 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2016-10-11 17:08:29 +0200 |
commit | 263246916cfde02dbd1b05f20b221e617759923a (patch) | |
tree | 32a55cba5c3ed98e7784282426278189fd6a7feb /java/src | |
parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
download | ice-263246916cfde02dbd1b05f20b221e617759923a.tar.bz2 ice-263246916cfde02dbd1b05f20b221e617759923a.tar.xz ice-263246916cfde02dbd1b05f20b221e617759923a.zip |
3.6 merge fixes
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginI.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginI.java b/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginI.java index 2266250e0af..3536c26ec23 100644 --- a/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginI.java +++ b/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginI.java @@ -101,6 +101,7 @@ class PluginI implements com.zeroc.Ice.Plugin } private final LocatorI _locator; + private com.zeroc.Ice.LocalException _exception = null; private final String _operation; private final com.zeroc.Ice.OperationMode _mode; private final java.util.Map<String, String> _context; |