commit d37d46dfbcedadeb439ad0367f8afcf8867dca43
author kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> Sat Apr 25 02:53:47 2009 +0000
committer kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> Sat Apr 25 02:53:47 2009 +0000
tree b896df229f7c671637924c156d5a759ba50a3190
parent 709ea28f3264aa5632e5577a4080671173fc6166

Integrate recent changes from Google-internal code tree.  See CHANGES.txt
for details.

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c7aadc6..afdfff0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,8 @@
   examples/add_person.py                                                     \
   examples/list_people.py                                                    \
   java/src/main/java/com/google/protobuf/AbstractMessage.java                \
+  java/src/main/java/com/google/protobuf/BlockingRpcChannel.java             \
+  java/src/main/java/com/google/protobuf/BlockingService.java                \
   java/src/main/java/com/google/protobuf/ByteString.java                     \
   java/src/main/java/com/google/protobuf/CodedInputStream.java               \
   java/src/main/java/com/google/protobuf/CodedOutputStream.java              \
@@ -77,6 +79,7 @@
   java/src/main/java/com/google/protobuf/RpcController.java                  \
   java/src/main/java/com/google/protobuf/RpcUtil.java                        \
   java/src/main/java/com/google/protobuf/Service.java                        \
+  java/src/main/java/com/google/protobuf/ServiceException.java               \
   java/src/main/java/com/google/protobuf/TextFormat.java                     \
   java/src/main/java/com/google/protobuf/UninitializedMessageException.java  \
   java/src/main/java/com/google/protobuf/UnknownFieldSet.java                \