summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/Reference.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/IceInternal/Reference.java')
-rw-r--r--java/src/IceInternal/Reference.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 8a51a34980b..6f6cbdedf9d 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -133,7 +133,7 @@ public final class Reference
//
// For compatibility with the old FacetPath.
//
- if(facet == null || facet.length() == 0)
+ if(facet.length() == 0)
{
s.writeStringSeq(null);
}
@@ -189,7 +189,7 @@ public final class Reference
s.append(id);
}
- if(facet != null && facet.length() > 0)
+ if(facet.length() > 0)
{
//
// If the encoded facet string contains characters which
@@ -834,6 +834,14 @@ public final class Reference
Ice.ObjectAdapter rvAdapter,
boolean collocationOpt)
{
+ //
+ // Validate string arguments.
+ //
+ assert(ident.name != null);
+ assert(ident.category != null);
+ assert(fac != null);
+ assert(adptId != null);
+
//
// It's either adapter id or endpoints, it can't be both.
//