diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/PropertiesI.java | 2 | ||||
| -rw-r--r-- | java/src/IceInternal/FixedReference.java | 3 | ||||
| -rw-r--r-- | java/src/IceInternal/LocalExceptionWrapper.java | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java index 6da3b5e778d..4fb078f74be 100644 --- a/java/src/Ice/PropertiesI.java +++ b/java/src/Ice/PropertiesI.java @@ -186,7 +186,7 @@ public final class PropertiesI implements Properties String pattern = IceInternal.PropertyNames.validProps[i][0].pattern(); dotPos = pattern.indexOf('.'); assert(dotPos != -1); - String propPrefix = pattern.substring(1, dotPos - 1); + String propPrefix = pattern.substring(0, dotPos - 1); if(!propPrefix.equals(prefix)) { continue; diff --git a/java/src/IceInternal/FixedReference.java b/java/src/IceInternal/FixedReference.java index d86791e7fb0..64f0818a88b 100644 --- a/java/src/IceInternal/FixedReference.java +++ b/java/src/IceInternal/FixedReference.java @@ -204,7 +204,8 @@ public class FixedReference extends Reference try { Ice.BooleanHolder compress = new Ice.BooleanHolder(); - callback.setConnection(getConnection(compress), compress.value); + Ice.ConnectionI connection = getConnection(compress); + callback.setConnection(connection, compress.value); } catch(Ice.LocalException ex) { diff --git a/java/src/IceInternal/LocalExceptionWrapper.java b/java/src/IceInternal/LocalExceptionWrapper.java index b41867594f4..abaf0317109 100644 --- a/java/src/IceInternal/LocalExceptionWrapper.java +++ b/java/src/IceInternal/LocalExceptionWrapper.java @@ -56,9 +56,7 @@ public class LocalExceptionWrapper extends Exception if(ex instanceof Ice.UnknownException || ex instanceof Ice.ObjectNotExistException || ex instanceof Ice.OperationNotExistException || - ex instanceof Ice.FacetNotExistException || - ex instanceof Ice.CollocationOptimizationException || - ex instanceof Ice.SystemException) + ex instanceof Ice.FacetNotExistException) { throw new LocalExceptionWrapper((Ice.LocalException)ex, false); } |