1 files changed, 11 insertions, 1 deletions
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index b8b175f5100..d7b5d5d3f6b 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -34,6 +34,8 @@ public class BasicStream
 	
 	_traceSlicing = -1;
 
+        _marshalFacets = true;
+
 	_messageSizeMax = _instance.messageSizeMax(); // Cached for efficiency.
     }
 
@@ -1311,11 +1313,17 @@ public class BasicStream
         while(num > 0);
     }
 
+    public void
+    marshalFacets(boolean b)
+    {
+        _marshalFacets = b;
+    }
+
     void
     writeInstance(Ice.Object v, Integer index)
     {
         writeInt(index.intValue());
-        v.__write(this);
+        v.__write(this, _marshalFacets);
     }
 
     void
@@ -1642,5 +1650,7 @@ public class BasicStream
     private int _traceSlicing;
     private String _slicingCat;
 
+    private boolean _marshalFacets;
+
     private int _messageSizeMax;
 }