4 files changed, 34 insertions, 10 deletions
diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java
index 0c68f1ee664..aab00a15d50 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/Ice/stream/Client.java
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
diff --git a/java/test/Ice/stream/Serialize/Small.java b/java/test/Ice/stream/Serialize/Small.java
index 34c91d87114..572d3ba10cf 100644
--- a/java/test/Ice/stream/Serialize/Small.java
+++ b/java/test/Ice/stream/Serialize/Small.java
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
diff --git a/java/test/Ice/stream/Test.ice b/java/test/Ice/stream/Test.ice
index d557984939d..5be23454461 100644
--- a/java/test/Ice/stream/Test.ice
+++ b/java/test/Ice/stream/Test.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -41,17 +41,41 @@ struct SmallStruct
     SerialSmall ss;
 };
 
+struct Point
+{
+    int x;
+    int y;
+};
+
+sequence<MyEnum> MyEnumS;
+sequence<MyClass> MyClassS;
+dictionary<byte, bool> ByteBoolD;
+dictionary<short, int> ShortIntD;
+dictionary<string, MyClass> StringMyClassD;
+
 class OptionalClass
 {
     bool bo;
     byte by;
     optional(1) short sh;
     optional(2) int i;
+    optional(3) SmallStruct sm;
+    
+    optional(4) MyEnumS enumS4;
+    optional(5) MyClassS myClassS5;
+    
+    optional(6) ByteBoolD byteBoolD6;
+    optional(7) ShortIntD shortIntD7;
+    
+    optional(8) MyEnum enum8;
+    optional(9) MyClass class9;
+    optional(10) StringMyClassD stringMyClassD10;
+    optional(12) Ice::IntSeq intSeq12;
+    optional(13) Ice::ByteSeq byteSeq13;
+    optional(14) Ice::StringSeq stringSeq14;
+    optional(15) Point p15;
 };
 
-sequence<MyEnum> MyEnumS;
-sequence<MyClass> MyClassS;
-
 sequence<Ice::BoolSeq> BoolSS;
 sequence<Ice::ByteSeq> ByteSS;
 sequence<Ice::ShortSeq> ShortSS;
@@ -63,15 +87,15 @@ sequence<Ice::StringSeq> StringSS;
 sequence<MyEnumS> MyEnumSS;
 sequence<MyClassS> MyClassSS;
 
-dictionary<byte, bool> ByteBoolD;
-dictionary<short, int> ShortIntD;
 dictionary<long, float> LongFloatD;
 dictionary<string, string> StringStringD;
-dictionary<string, MyClass> StringMyClassD;
+
+class Bar;
 
 class MyClass
 {
     MyClass c;
+    MyClass* prx;
     Object o;
     SmallStruct s;
     Ice::BoolSeq seq1;
diff --git a/java/test/Ice/stream/run.py b/java/test/Ice/stream/run.py
index b2776df70a0..08e9e18a321 100755
--- a/java/test/Ice/stream/run.py
+++ b/java/test/Ice/stream/run.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.